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.

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"
 

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"

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"

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"
 

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"