diff options
Diffstat (limited to 'src')
33 files changed, 64 insertions, 37 deletions
diff --git a/src/mm-auth-provider-polkit.c b/src/mm-auth-provider-polkit.c index d8438c68..c914e3d0 100644 --- a/src/mm-auth-provider-polkit.c +++ b/src/mm-auth-provider-polkit.c @@ -18,8 +18,6 @@ #include <config.h> -#include <libmm-common.h> - #include "mm-log.h" #include "mm-auth-provider-polkit.h" diff --git a/src/mm-bearer-list.c b/src/mm-bearer-list.c index d5cb1e9a..43ccf8f7 100644 --- a/src/mm-bearer-list.c +++ b/src/mm-bearer-list.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer-list.h" #include "mm-log.h" diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index 3d91ad74..ed1c79b3 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -21,8 +21,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> -#include <libqmi-glib.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer-qmi.h" #include "mm-serial-enums-types.h" diff --git a/src/mm-bearer-qmi.h b/src/mm-bearer-qmi.h index 65a83d59..915e1708 100644 --- a/src/mm-bearer-qmi.h +++ b/src/mm-bearer-qmi.h @@ -21,7 +21,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer.h" #include "mm-broadband-modem-qmi.h" diff --git a/src/mm-bearer.c b/src/mm-bearer.c index 9720fc87..61ccbf0e 100644 --- a/src/mm-bearer.c +++ b/src/mm-bearer.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-daemon-enums-types.h" #include "mm-iface-modem.h" diff --git a/src/mm-bearer.h b/src/mm-bearer.h index 1791b356..dfcf1724 100644 --- a/src/mm-bearer.h +++ b/src/mm-bearer.h @@ -21,7 +21,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-base-modem.h" diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c index fa3ba664..341f9886 100644 --- a/src/mm-broadband-bearer.c +++ b/src/mm-broadband-bearer.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer.h" #include "mm-iface-modem.h" diff --git a/src/mm-broadband-bearer.h b/src/mm-broadband-bearer.h index a891fbfd..2cce5708 100644 --- a/src/mm-broadband-bearer.h +++ b/src/mm-broadband-bearer.h @@ -21,7 +21,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer.h" #include "mm-broadband-modem.h" diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 76eec7c9..f9131c6f 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-base-modem-at.h" #include "mm-broadband-modem.h" diff --git a/src/mm-charsets.c b/src/mm-charsets.c index b6937cbd..023879be 100644 --- a/src/mm-charsets.c +++ b/src/mm-charsets.c @@ -20,7 +20,8 @@ #include <string.h> #include <ctype.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-charsets.h" diff --git a/src/mm-device.c b/src/mm-device.c index d7ff1fb0..c5491008 100644 --- a/src/mm-device.c +++ b/src/mm-device.c @@ -20,7 +20,8 @@ #include <string.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-device.h" #include "mm-plugin.h" diff --git a/src/mm-iface-modem-3gpp-ussd.c b/src/mm-iface-modem-3gpp-ussd.c index d92362c4..0763c08e 100644 --- a/src/mm-iface-modem-3gpp-ussd.c +++ b/src/mm-iface-modem-3gpp-ussd.c @@ -18,7 +18,8 @@ #include <string.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-iface-modem-3gpp.h" diff --git a/src/mm-iface-modem-3gpp-ussd.h b/src/mm-iface-modem-3gpp-ussd.h index 3d99185f..9e1dc433 100644 --- a/src/mm-iface-modem-3gpp-ussd.h +++ b/src/mm-iface-modem-3gpp-ussd.h @@ -20,7 +20,8 @@ #include <glib-object.h> #include <gio/gio.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-at-serial-port.h" diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c index a3dcb86f..961495b2 100644 --- a/src/mm-iface-modem-3gpp.c +++ b/src/mm-iface-modem-3gpp.c @@ -17,7 +17,8 @@ #include <string.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-iface-modem-location.h" diff --git a/src/mm-iface-modem-3gpp.h b/src/mm-iface-modem-3gpp.h index aaf727cd..d706f1aa 100644 --- a/src/mm-iface-modem-3gpp.h +++ b/src/mm-iface-modem-3gpp.h @@ -18,8 +18,8 @@ #include <glib-object.h> #include <gio/gio.h> - -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-at-serial-port.h" diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 2ba55a6a..ab4ea4ce 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -14,7 +14,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "libqcdm/src/commands.h" diff --git a/src/mm-iface-modem-cdma.h b/src/mm-iface-modem-cdma.h index 8fb334b4..37f81636 100644 --- a/src/mm-iface-modem-cdma.h +++ b/src/mm-iface-modem-cdma.h @@ -19,7 +19,8 @@ #include <glib-object.h> #include <gio/gio.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-at-serial-port.h" diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c index b58f1e78..d6e897c2 100644 --- a/src/mm-iface-modem-location.c +++ b/src/mm-iface-modem-location.c @@ -15,7 +15,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-iface-modem-location.h" diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c index 5861b373..d94f6c14 100644 --- a/src/mm-iface-modem-messaging.c +++ b/src/mm-iface-modem-messaging.c @@ -14,7 +14,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-iface-modem-messaging.h" diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c index cfec2805..952a3c03 100644 --- a/src/mm-iface-modem-simple.c +++ b/src/mm-iface-modem-simple.c @@ -16,7 +16,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer-list.h" #include "mm-sim.h" diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c index f9c61d76..9a5d1d98 100644 --- a/src/mm-iface-modem-time.c +++ b/src/mm-iface-modem-time.c @@ -14,7 +14,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-iface-modem-time.h" diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 41036a26..a4f44fdd 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -15,7 +15,8 @@ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-modem-helpers.h" #include "mm-iface-modem.h" diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h index d4d9db4f..b5e7ddc4 100644 --- a/src/mm-iface-modem.h +++ b/src/mm-iface-modem.h @@ -19,7 +19,8 @@ #include <glib-object.h> #include <gio/gio.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-charsets.h" #include "mm-at-serial-port.h" diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 6692b6fd..fe30317c 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -25,7 +25,8 @@ #include <arpa/inet.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-modem-helpers.h" #include "mm-log.h" diff --git a/src/mm-sim-qmi.c b/src/mm-sim-qmi.c index c2f28c63..63111b54 100644 --- a/src/mm-sim-qmi.c +++ b/src/mm-sim-qmi.c @@ -21,7 +21,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-sim-qmi.h" diff --git a/src/mm-sim.c b/src/mm-sim.c index 6503d342..8f50edd7 100644 --- a/src/mm-sim.c +++ b/src/mm-sim.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem.h" #include "mm-sim.h" diff --git a/src/mm-sms-list.c b/src/mm-sms-list.c index a34bd679..258470eb 100644 --- a/src/mm-sms-list.c +++ b/src/mm-sms-list.c @@ -21,7 +21,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-iface-modem-messaging.h" #include "mm-marshal.h" diff --git a/src/mm-sms-part.c b/src/mm-sms-part.c index 7cac9b88..f3957d05 100644 --- a/src/mm-sms-part.c +++ b/src/mm-sms-part.c @@ -20,8 +20,8 @@ #include <glib.h> #include <ModemManager.h> -#include <mm-errors-types.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-sms-part.h" #include "mm-charsets.h" diff --git a/src/mm-sms-qmi.c b/src/mm-sms-qmi.c index afa307f8..2b167ed2 100644 --- a/src/mm-sms-qmi.c +++ b/src/mm-sms-qmi.c @@ -21,7 +21,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-modem-helpers-qmi.h" #include "mm-iface-modem-messaging.h" diff --git a/src/mm-sms-qmi.h b/src/mm-sms-qmi.h index d6871d3f..bceb300f 100644 --- a/src/mm-sms-qmi.h +++ b/src/mm-sms-qmi.h @@ -21,7 +21,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-sms.h" diff --git a/src/mm-sms.c b/src/mm-sms.c index b0f9a11a..c540692e 100644 --- a/src/mm-sms.c +++ b/src/mm-sms.c @@ -23,7 +23,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-modem.h" #include "mm-iface-modem.h" diff --git a/src/mm-sms.h b/src/mm-sms.h index 0f96e380..0a3339f8 100644 --- a/src/mm-sms.h +++ b/src/mm-sms.h @@ -21,7 +21,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-sms-part.h" #include "mm-base-modem.h" diff --git a/src/tests/test-sms-part.c b/src/tests/test-sms-part.c index f052913c..c23497b1 100644 --- a/src/tests/test-sms-part.c +++ b/src/tests/test-sms-part.c @@ -20,7 +20,8 @@ #include <stdio.h> #include <locale.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-sms-part.h" #include "mm-log.h" |