libmm-glib: remove the `libmm-common.h' header

Both the ModemManager daemon and the mmcli will now include `libmm-glib.h' only. We also handle two new special `_LIBMM_INSIDE_MM' and `LIBMM_INSIDE_MMCLI' symbols, which if included before the `libmm-glib.h' library allow us to: * Don't include the libmm-glib high level API in the ModemManager daemon, as the object names would clash with those in the core. * Define some of the methods of helper objects to be included only if compiling ModemManager daemon or the mmcli.
2012-10-03 12:46:37 +02:00
parent 8bdcdeecb6
commit c250fa3797
117 changed files with 292 additions and 165 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"