diff options
Diffstat (limited to 'plugins')
40 files changed, 84 insertions, 41 deletions
diff --git a/plugins/anydata/mm-plugin-anydata.c b/plugins/anydata/mm-plugin-anydata.c index 3229ddc6..ffa3afdb 100644 --- a/plugins/anydata/mm-plugin-anydata.c +++ b/plugins/anydata/mm-plugin-anydata.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-anydata.h" diff --git a/plugins/cinterion/mm-plugin-cinterion.c b/plugins/cinterion/mm-plugin-cinterion.c index 22945d6c..d7ba3d62 100644 --- a/plugins/cinterion/mm-plugin-cinterion.c +++ b/plugins/cinterion/mm-plugin-cinterion.c @@ -24,7 +24,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-cinterion.h" #include "mm-broadband-modem-cinterion.h" diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c index 6721fe04..1a48f033 100644 --- a/plugins/generic/mm-plugin-generic.c +++ b/plugins/generic/mm-plugin-generic.c @@ -25,7 +25,8 @@ #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-generic.h" #include "mm-broadband-modem.h" diff --git a/plugins/gobi/mm-plugin-gobi.c b/plugins/gobi/mm-plugin-gobi.c index 9498d7a6..6f2280d0 100644 --- a/plugins/gobi/mm-plugin-gobi.c +++ b/plugins/gobi/mm-plugin-gobi.c @@ -17,7 +17,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-gobi.h" #include "mm-broadband-modem-gobi.h" diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 685b5f8c..56adba53 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -23,10 +23,12 @@ #include <unistd.h> #include <ctype.h> -#include "ModemManager.h" +#include <ModemManager.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> + #include "mm-log.h" #include "mm-errors-types.h" -#include "mm-common-helpers.h" #include "mm-modem-helpers.h" #include "mm-base-modem-at.h" #include "mm-iface-modem.h" diff --git a/plugins/huawei/mm-plugin-huawei.c b/plugins/huawei/mm-plugin-huawei.c index f51a61ea..428ece5a 100644 --- a/plugins/huawei/mm-plugin-huawei.c +++ b/plugins/huawei/mm-plugin-huawei.c @@ -20,7 +20,8 @@ #include <string.h> #include <errno.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-serial-enums-types.h" #include "mm-log.h" diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c index 2b9ebb35..0e5193f0 100644 --- a/plugins/icera/mm-broadband-bearer-icera.c +++ b/plugins/icera/mm-broadband-bearer-icera.c @@ -24,7 +24,8 @@ #include <arpa/inet.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer-icera.h" #include "mm-base-modem-at.h" diff --git a/plugins/icera/mm-broadband-bearer-icera.h b/plugins/icera/mm-broadband-bearer-icera.h index 058dbddb..4edd1896 100644 --- a/plugins/icera/mm-broadband-bearer-icera.h +++ b/plugins/icera/mm-broadband-bearer-icera.h @@ -22,7 +22,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer.h" diff --git a/plugins/iridium/mm-bearer-iridium.c b/plugins/iridium/mm-bearer-iridium.c index 5f3c03cb..fe2013bd 100644 --- a/plugins/iridium/mm-bearer-iridium.c +++ b/plugins/iridium/mm-bearer-iridium.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-bearer-iridium.h" #include "mm-base-modem-at.h" diff --git a/plugins/iridium/mm-bearer-iridium.h b/plugins/iridium/mm-bearer-iridium.h index 191de0f8..3b2b06d2 100644 --- a/plugins/iridium/mm-bearer-iridium.h +++ b/plugins/iridium/mm-bearer-iridium.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-broadband-bearer.h" #include "mm-broadband-modem-iridium.h" diff --git a/plugins/iridium/mm-plugin-iridium.c b/plugins/iridium/mm-plugin-iridium.c index bbdec81f..3f504a24 100644 --- a/plugins/iridium/mm-plugin-iridium.c +++ b/plugins/iridium/mm-plugin-iridium.c @@ -23,7 +23,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-iridium.h" #include "mm-broadband-modem-iridium.h" diff --git a/plugins/iridium/mm-sim-iridium.c b/plugins/iridium/mm-sim-iridium.c index 519b6f90..9d77d785 100644 --- a/plugins/iridium/mm-sim-iridium.c +++ b/plugins/iridium/mm-sim-iridium.c @@ -22,7 +22,8 @@ #include <ctype.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-sim-iridium.h" diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/plugins/linktop/mm-broadband-modem-linktop.c index 74793b22..c34cf09a 100644 --- a/plugins/linktop/mm-broadband-modem-linktop.c +++ b/plugins/linktop/mm-broadband-modem-linktop.c @@ -23,7 +23,8 @@ #include <unistd.h> #include <ctype.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "ModemManager.h" #include "mm-serial-parsers.h" diff --git a/plugins/linktop/mm-plugin-linktop.c b/plugins/linktop/mm-plugin-linktop.c index 61bbb0e4..8919d4b5 100644 --- a/plugins/linktop/mm-plugin-linktop.c +++ b/plugins/linktop/mm-plugin-linktop.c @@ -17,7 +17,9 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> + +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-linktop.h" #include "mm-broadband-modem-linktop.h" diff --git a/plugins/longcheer/mm-plugin-longcheer.c b/plugins/longcheer/mm-plugin-longcheer.c index ddfb83f5..6f79d9f5 100644 --- a/plugins/longcheer/mm-plugin-longcheer.c +++ b/plugins/longcheer/mm-plugin-longcheer.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-modem-helpers.h" diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c index 08c72846..ee9399db 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.c +++ b/plugins/mbm/mm-broadband-bearer-mbm.c @@ -32,7 +32,8 @@ #include <arpa/inet.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-bearer-mbm.h" diff --git a/plugins/mbm/mm-broadband-bearer-mbm.h b/plugins/mbm/mm-broadband-bearer-mbm.h index ca798008..dcbeeecf 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.h +++ b/plugins/mbm/mm-broadband-bearer-mbm.h @@ -28,7 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer.h" #include "mm-broadband-modem-mbm.h" diff --git a/plugins/mbm/mm-plugin-mbm.c b/plugins/mbm/mm-plugin-mbm.c index 09ba5ccd..d776265f 100644 --- a/plugins/mbm/mm-plugin-mbm.c +++ b/plugins/mbm/mm-plugin-mbm.c @@ -20,7 +20,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-mbm.h" diff --git a/plugins/motorola/mm-plugin-motorola.c b/plugins/motorola/mm-plugin-motorola.c index 203320f6..f25d9a29 100644 --- a/plugins/motorola/mm-plugin-motorola.c +++ b/plugins/motorola/mm-plugin-motorola.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-private-boxed-types.h" #include "mm-plugin-motorola.h" diff --git a/plugins/nokia/mm-plugin-nokia-icera.c b/plugins/nokia/mm-plugin-nokia-icera.c index b85e7d5f..3840bbac 100644 --- a/plugins/nokia/mm-plugin-nokia-icera.c +++ b/plugins/nokia/mm-plugin-nokia-icera.c @@ -17,7 +17,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-nokia-icera.h" diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c index e65eca67..3a767737 100644 --- a/plugins/nokia/mm-plugin-nokia.c +++ b/plugins/nokia/mm-plugin-nokia.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-nokia.h" diff --git a/plugins/nokia/mm-sim-nokia.c b/plugins/nokia/mm-sim-nokia.c index c0ecfb14..6497b041 100644 --- a/plugins/nokia/mm-sim-nokia.c +++ b/plugins/nokia/mm-sim-nokia.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-sim-nokia.h" diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c index f0208ba8..e7e76f64 100644 --- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c +++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c @@ -24,7 +24,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-bearer-novatel-lte.h" diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.h b/plugins/novatel/mm-broadband-bearer-novatel-lte.h index 362c1306..b304789a 100644 --- a/plugins/novatel/mm-broadband-bearer-novatel-lte.h +++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.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-broadband-bearer.h" #include "mm-broadband-modem-novatel-lte.h" diff --git a/plugins/novatel/mm-sim-novatel-lte.c b/plugins/novatel/mm-sim-novatel-lte.c index 9e185b81..b5bccdb0 100644 --- a/plugins/novatel/mm-sim-novatel-lte.c +++ b/plugins/novatel/mm-sim-novatel-lte.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-modem-helpers.h" #include "mm-base-modem-at.h" diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c index 4f1c2509..999964ae 100644 --- a/plugins/option/mm-broadband-bearer-hso.c +++ b/plugins/option/mm-broadband-bearer-hso.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-base-modem-at.h" #include "mm-broadband-bearer-hso.h" diff --git a/plugins/option/mm-broadband-bearer-hso.h b/plugins/option/mm-broadband-bearer-hso.h index 24e7aa3b..584fc03d 100644 --- a/plugins/option/mm-broadband-bearer-hso.h +++ b/plugins/option/mm-broadband-bearer-hso.h @@ -19,7 +19,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer.h" #include "mm-broadband-modem-hso.h" diff --git a/plugins/option/mm-plugin-hso.c b/plugins/option/mm-plugin-hso.c index 7e1a8ec2..ce80a122 100644 --- a/plugins/option/mm-plugin-hso.c +++ b/plugins/option/mm-plugin-hso.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-private-boxed-types.h" #include "mm-plugin-hso.h" diff --git a/plugins/option/mm-plugin-option.c b/plugins/option/mm-plugin-option.c index 7579f628..24b8a4bc 100644 --- a/plugins/option/mm-plugin-option.c +++ b/plugins/option/mm-plugin-option.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-private-boxed-types.h" #include "mm-plugin-option.h" diff --git a/plugins/pantech/mm-plugin-pantech.c b/plugins/pantech/mm-plugin-pantech.c index 843a315d..774a5b9d 100644 --- a/plugins/pantech/mm-plugin-pantech.c +++ b/plugins/pantech/mm-plugin-pantech.c @@ -16,7 +16,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-pantech.h" diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/plugins/sierra/mm-broadband-bearer-sierra.c index a28feca7..4b20380f 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.c +++ b/plugins/sierra/mm-broadband-bearer-sierra.c @@ -24,7 +24,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-bearer-sierra.h" diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/plugins/sierra/mm-broadband-bearer-sierra.h index 20ebc26d..92a5acc8 100644 --- a/plugins/sierra/mm-broadband-bearer-sierra.h +++ b/plugins/sierra/mm-broadband-bearer-sierra.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-broadband-bearer.h" #include "mm-broadband-modem-sierra.h" diff --git a/plugins/sierra/mm-plugin-sierra.c b/plugins/sierra/mm-plugin-sierra.c index 1a583977..0817f9cc 100644 --- a/plugins/sierra/mm-plugin-sierra.c +++ b/plugins/sierra/mm-plugin-sierra.c @@ -19,7 +19,8 @@ #include <stdlib.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-sierra.h" diff --git a/plugins/sierra/mm-sim-sierra.c b/plugins/sierra/mm-sim-sierra.c index 3c852a9d..1b741de6 100644 --- a/plugins/sierra/mm-sim-sierra.c +++ b/plugins/sierra/mm-sim-sierra.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-log.h" #include "mm-modem-helpers.h" #include "mm-base-modem-at.h" diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/plugins/simtech/mm-broadband-modem-simtech.c index 5d41c80f..359dde50 100644 --- a/plugins/simtech/mm-broadband-modem-simtech.c +++ b/plugins/simtech/mm-broadband-modem-simtech.c @@ -23,7 +23,8 @@ #include <unistd.h> #include <ctype.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "ModemManager.h" #include "mm-modem-helpers.h" diff --git a/plugins/simtech/mm-plugin-simtech.c b/plugins/simtech/mm-plugin-simtech.c index 3b4f69f7..80eca362 100644 --- a/plugins/simtech/mm-plugin-simtech.c +++ b/plugins/simtech/mm-plugin-simtech.c @@ -17,7 +17,9 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> + +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-simtech.h" #include "mm-broadband-modem-simtech.h" diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/plugins/wavecom/mm-broadband-modem-wavecom.c index ca9f29ca..e6afb730 100644 --- a/plugins/wavecom/mm-broadband-modem-wavecom.c +++ b/plugins/wavecom/mm-broadband-modem-wavecom.c @@ -23,7 +23,8 @@ #include <unistd.h> #include <ctype.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "ModemManager.h" #include "mm-log.h" diff --git a/plugins/wavecom/mm-plugin-wavecom.c b/plugins/wavecom/mm-plugin-wavecom.c index 82eec9bc..80b6ed71 100644 --- a/plugins/wavecom/mm-plugin-wavecom.c +++ b/plugins/wavecom/mm-plugin-wavecom.c @@ -25,7 +25,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-wavecom.h" #include "mm-broadband-modem-wavecom.h" diff --git a/plugins/x22x/mm-plugin-x22x.c b/plugins/x22x/mm-plugin-x22x.c index 859fc4b4..09606907 100644 --- a/plugins/x22x/mm-plugin-x22x.c +++ b/plugins/x22x/mm-plugin-x22x.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-modem-helpers.h" diff --git a/plugins/zte/mm-plugin-zte.c b/plugins/zte/mm-plugin-zte.c index 241e5b2c..75c879cf 100644 --- a/plugins/zte/mm-plugin-zte.c +++ b/plugins/zte/mm-plugin-zte.c @@ -18,7 +18,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-zte.h" |