libmm-common: `MMBearerProperties' won't be considered internal any more

Renamed `MMCommonBearerProperties' to `MMBearerProperties', and removed the
`MMBearerProperties' provided in libmm-glib. We'll just use the original one
from libmm-common always.

7 files changed, 3 insertions, 286 deletions

diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index a0ebc353..adebf032 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -40,8 +40,6 @@ libmm_glib_la_SOURCES = \
 	mm-sms.c \
 	mm-modem-messaging.h \
 	mm-modem-messaging.c \
-	mm-bearer-properties.h \
-	mm-bearer-properties.c \
 	mm-bearer.h \
 	mm-bearer.c
 
@@ -61,5 +59,4 @@ include_HEADERS = \
 	mm-modem-simple.h \
 	mm-sim.h \
 	mm-sms.h \
-	mm-bearer-properties.h \
 	mm-bearer.h
diff --git a/libmm-glib/mm-bearer-properties.c b/libmm-glib/mm-bearer-properties.c
deleted file mode 100644
index 5f14eb56..00000000
--- a/libmm-glib/mm-bearer-properties.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org>
- */
-
-#include "mm-bearer-properties.h"
-
-void
-mm_bearer_properties_set_apn (MMBearerProperties *self,
-                              const gchar *apn)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_apn (self, apn);
-}
-
-void
-mm_bearer_properties_set_user (MMBearerProperties *self,
-                               const gchar *user)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_user (self, user);
-}
-
-void
-mm_bearer_properties_set_password (MMBearerProperties *self,
-                                   const gchar *password)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_password (self, password);
-}
-
-void
-mm_bearer_properties_set_ip_type (MMBearerProperties *self,
-                                  const gchar *ip_type)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_ip_type (self, ip_type);
-}
-
-void
-mm_bearer_properties_set_allow_roaming (MMBearerProperties *self,
-                                        gboolean allow_roaming)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_allow_roaming (self, allow_roaming);
-}
-
-void
-mm_bearer_properties_set_number (MMBearerProperties *self,
-                                 const gchar *number)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_number (self, number);
-}
-
-void
-mm_bearer_properties_set_rm_protocol (MMBearerProperties *self,
-                                      MMModemCdmaRmProtocol protocol)
-{
-    g_return_if_fail (MM_IS_BEARER_PROPERTIES (self));
-
-    mm_common_bearer_properties_set_rm_protocol (self, protocol);
-}
-
-const gchar *
-mm_bearer_properties_get_apn (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return mm_common_bearer_properties_get_apn (self);
-}
-
-gchar *
-mm_bearer_properties_dup_apn (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return g_strdup (mm_common_bearer_properties_get_apn (self));
-}
-
-const gchar *
-mm_bearer_properties_get_user (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return mm_common_bearer_properties_get_user (self);
-}
-
-gchar *
-mm_bearer_properties_dup_user (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return g_strdup (mm_common_bearer_properties_get_user (self));
-}
-
-const gchar *
-mm_bearer_properties_get_password (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return mm_common_bearer_properties_get_password (self);
-}
-
-gchar *
-mm_bearer_properties_dup_password (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return g_strdup (mm_common_bearer_properties_get_password (self));
-}
-
-const gchar *
-mm_bearer_properties_get_ip_type (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return mm_common_bearer_properties_get_ip_type (self);
-}
-
-gchar *
-mm_bearer_properties_dup_ip_type (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return g_strdup (mm_common_bearer_properties_get_ip_type (self));
-}
-
-gboolean
-mm_bearer_properties_get_allow_roaming (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), FALSE);
-
-    return mm_common_bearer_properties_get_allow_roaming (self);
-}
-
-const gchar *
-mm_bearer_properties_get_number (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return mm_common_bearer_properties_get_number (self);
-}
-
-gchar *
-mm_bearer_properties_dup_number (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), NULL);
-
-    return g_strdup (mm_common_bearer_properties_get_number (self));
-}
-
-MMModemCdmaRmProtocol
-mm_bearer_properties_get_rm_protocol (MMBearerProperties *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_PROPERTIES (self), MM_MODEM_CDMA_RM_PROTOCOL_UNKNOWN);
-
-    return mm_common_bearer_properties_get_rm_protocol (self);
-}
-
-/*****************************************************************************/
-
-MMBearerProperties *
-mm_bearer_properties_new_from_string (const gchar *str,
-                                      GError **error)
-{
-    return mm_common_bearer_properties_new_from_string (str, error);
-}
-
-MMBearerProperties *
-mm_bearer_properties_new (void)
-{
-    return mm_common_bearer_properties_new ();
-}
diff --git a/libmm-glib/mm-bearer-properties.h b/libmm-glib/mm-bearer-properties.h
deleted file mode 100644
index 6d7442d5..00000000
--- a/libmm-glib/mm-bearer-properties.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- *
- * Copyright (C) 2011 Aleksander Morgado <aleksander@gnu.org>
- */
-
-#ifndef MM_BEARER_PROPERTIES_H
-#define MM_BEARER_PROPERTIES_H
-
-#include <ModemManager.h>
-#include <glib-object.h>
-
-#include <libmm-common.h>
-
-G_BEGIN_DECLS
-
-typedef MMCommonBearerProperties     MMBearerProperties;
-#define MM_TYPE_BEARER_PROPERTIES(o) MM_TYPE_COMMON_BEARER_PROPERTIES (o)
-#define MM_BEARER_PROPERTIES(o)      MM_COMMON_BEARER_PROPERTIES(o)
-#define MM_IS_BEARER_PROPERTIES(o)   MM_IS_COMMON_BEARER_PROPERTIES(o)
-
-MMBearerProperties *mm_bearer_properties_new (void);
-MMBearerProperties *mm_bearer_properties_new_from_string (
-    const gchar *str,
-    GError **error);
-
-void mm_bearer_properties_set_apn (
-    MMBearerProperties *properties,
-    const gchar *apn);
-void mm_bearer_properties_set_user (
-    MMBearerProperties *properties,
-    const gchar *user);
-void mm_bearer_properties_set_password (
-    MMBearerProperties *properties,
-    const gchar *password);
-void mm_bearer_properties_set_ip_type (
-    MMBearerProperties *properties,
-    const gchar *ip_type);
-void mm_bearer_properties_set_allow_roaming (
-    MMBearerProperties *properties,
-    gboolean allow_roaming);
-void mm_bearer_properties_set_number (
-    MMBearerProperties *properties,
-    const gchar *number);
-void mm_bearer_properties_set_rm_protocol (
-    MMBearerProperties *properties,
-    MMModemCdmaRmProtocol protocol);
-
-const gchar *mm_bearer_properties_get_apn (
-    MMBearerProperties *properties);
-gchar *mm_bearer_properties_dup_apn (
-    MMBearerProperties *properties);
-const gchar *mm_bearer_properties_get_user (
-    MMBearerProperties *properties);
-gchar *mm_bearer_properties_dup_user (
-    MMBearerProperties *properties);
-const gchar *mm_bearer_properties_get_password (
-    MMBearerProperties *properties);
-gchar *mm_bearer_properties_dup_password (
-    MMBearerProperties *properties);
-const gchar *mm_bearer_properties_get_ip_type (
-    MMBearerProperties *properties);
-gchar *mm_bearer_properties_dup_ip_type (
-    MMBearerProperties *properties);
-gboolean mm_bearer_properties_get_allow_roaming (
-    MMBearerProperties *properties);
-const gchar *mm_bearer_properties_get_number (
-    MMBearerProperties *properties);
-gchar *mm_bearer_properties_dup_number (
-    MMBearerProperties *properties);
-MMModemCdmaRmProtocol mm_bearer_properties_get_rm_protocol (
-    MMBearerProperties *properties);
-
-G_END_DECLS
-
-#endif /* MM_BEARER_PROPERTIES_H */
diff --git a/libmm-glib/mm-bearer.c b/libmm-glib/mm-bearer.c
index e815aa50..ccd3e77f 100644
--- a/libmm-glib/mm-bearer.c
+++ b/libmm-glib/mm-bearer.c
@@ -193,7 +193,7 @@ mm_bearer_get_properties (MMBearer *self)
 
     g_return_val_if_fail (MM_IS_BEARER (self), NULL);
 
-    properties = (mm_common_bearer_properties_new_from_dictionary (
+    properties = (mm_bearer_properties_new_from_dictionary (
                       mm_gdbus_bearer_get_properties (MM_GDBUS_BEARER (self)),
                       &error));
     if (!properties) {
diff --git a/libmm-glib/mm-bearer.h b/libmm-glib/mm-bearer.h
index cf54695d..e03f8288 100644
--- a/libmm-glib/mm-bearer.h
+++ b/libmm-glib/mm-bearer.h
@@ -26,8 +26,6 @@
 #include <ModemManager.h>
 #include <libmm-common.h>
 
-#include "mm-bearer-properties.h"
-
 G_BEGIN_DECLS
 
 typedef MmGdbusBearer     MMBearer;
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index 5edf6abd..c5e81035 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -1225,8 +1225,7 @@ mm_modem_create_bearer (MMModem *self,
     if (cancellable)
         ctx->cancellable = g_object_ref (cancellable);
 
-    dictionary = (mm_common_bearer_properties_get_dictionary (
-                      MM_COMMON_BEARER_PROPERTIES (properties)));
+    dictionary = mm_bearer_properties_get_dictionary (properties);
     mm_gdbus_modem_call_create_bearer (
         self,
         dictionary,
@@ -1268,8 +1267,7 @@ mm_modem_create_bearer_sync (MMModem *self,
 
     g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), NULL);
 
-    dictionary = (mm_common_bearer_properties_get_dictionary (
-                      MM_COMMON_BEARER_PROPERTIES (properties)));
+    dictionary = mm_bearer_properties_get_dictionary (properties);
     mm_gdbus_modem_call_create_bearer_sync (self,
                                             dictionary,
                                             &bearer_path,
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index a55df65f..0fec622c 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -28,7 +28,6 @@
 
 #include "mm-sim.h"
 #include "mm-bearer.h"
-#include "mm-bearer-properties.h"
 
 G_BEGIN_DECLS