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

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

5 files changed, 2 insertions, 101 deletions

diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index a44312a0..a0ebc353 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -42,8 +42,6 @@ libmm_glib_la_SOURCES = \
 	mm-modem-messaging.c \
 	mm-bearer-properties.h \
 	mm-bearer-properties.c \
-	mm-bearer-ip-config.h \
-	mm-bearer-ip-config.c \
 	mm-bearer.h \
 	mm-bearer.c
 
@@ -64,5 +62,4 @@ include_HEADERS = \
 	mm-sim.h \
 	mm-sms.h \
 	mm-bearer-properties.h \
-	mm-bearer-ip-config.h \
 	mm-bearer.h
diff --git a/libmm-glib/mm-bearer-ip-config.c b/libmm-glib/mm-bearer-ip-config.c
deleted file mode 100644
index b964e408..00000000
--- a/libmm-glib/mm-bearer-ip-config.c
+++ /dev/null
@@ -1,56 +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) 2012 Google, Inc.
- */
-
-#include "mm-bearer-ip-config.h"
-
-MMBearerIpMethod
-mm_bearer_ip_config_get_method (MMBearerIpConfig *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), MM_BEARER_IP_METHOD_UNKNOWN);
-
-    return mm_common_bearer_ip_config_get_method (self);
-}
-
-const gchar *
-mm_bearer_ip_config_get_address (MMBearerIpConfig *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL);
-
-    return mm_common_bearer_ip_config_get_address (self);
-}
-
-guint
-mm_bearer_ip_config_get_prefix (MMBearerIpConfig *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), 0);
-
-    return mm_common_bearer_ip_config_get_prefix (self);
-}
-
-const gchar **
-mm_bearer_ip_config_get_dns (MMBearerIpConfig *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL);
-
-    return mm_common_bearer_ip_config_get_dns (self);
-}
-
-const gchar *
-mm_bearer_ip_config_get_gateway (MMBearerIpConfig *self)
-{
-    g_return_val_if_fail (MM_IS_BEARER_IP_CONFIG (self), NULL);
-
-    return mm_common_bearer_ip_config_get_gateway (self);
-}
diff --git a/libmm-glib/mm-bearer-ip-config.h b/libmm-glib/mm-bearer-ip-config.h
deleted file mode 100644
index ff2882bc..00000000
--- a/libmm-glib/mm-bearer-ip-config.h
+++ /dev/null
@@ -1,39 +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) 2012 Google, Inc.
- */
-
-#ifndef MM_BEARER_IP_CONFIG_H
-#define MM_BEARER_IP_CONFIG_H
-
-#include <ModemManager.h>
-#include <glib-object.h>
-
-#include <libmm-common.h>
-
-G_BEGIN_DECLS
-
-typedef MMCommonBearerIpConfig      MMBearerIpConfig;
-#define MM_TYPE_BEARER_IP_CONFIG(o) MM_TYPE_COMMON_BEARER_IP_CONFIG (o)
-#define MM_BEARER_IP_CONFIG(o)      MM_COMMON_BEARER_IP_CONFIG(o)
-#define MM_IS_BEARER_IP_CONFIG(o)   MM_IS_COMMON_BEARER_IP_CONFIG(o)
-
-MMBearerIpMethod   mm_bearer_ip_config_get_method  (MMBearerIpConfig *self);
-const gchar       *mm_bearer_ip_config_get_address (MMBearerIpConfig *self);
-guint              mm_bearer_ip_config_get_prefix  (MMBearerIpConfig *self);
-const gchar      **mm_bearer_ip_config_get_dns     (MMBearerIpConfig *self);
-const gchar       *mm_bearer_ip_config_get_gateway (MMBearerIpConfig *self);
-
-G_END_DECLS
-
-#endif /* MM_BEARER_IP_CONFIG_H */
diff --git a/libmm-glib/mm-bearer.c b/libmm-glib/mm-bearer.c
index 6aae79da..e815aa50 100644
--- a/libmm-glib/mm-bearer.c
+++ b/libmm-glib/mm-bearer.c
@@ -155,7 +155,7 @@ mm_bearer_get_ipv4_config (MMBearer *self)
     g_return_val_if_fail (MM_IS_BEARER (self), NULL);
 
     variant = mm_gdbus_bearer_dup_ip4_config (MM_GDBUS_BEARER (self));
-    config = mm_common_bearer_ip_config_new_from_dictionary (variant, &error);
+    config = mm_bearer_ip_config_new_from_dictionary (variant, &error);
     if (!config) {
         g_warning ("Couldn't create IP config: '%s'", error->message);
         g_error_free (error);
@@ -175,7 +175,7 @@ mm_bearer_get_ipv6_config (MMBearer *self)
     g_return_val_if_fail (MM_IS_BEARER (self), NULL);
 
     variant = mm_gdbus_bearer_dup_ip6_config (MM_GDBUS_BEARER (self));
-    config = mm_common_bearer_ip_config_new_from_dictionary (variant, &error);
+    config = mm_bearer_ip_config_new_from_dictionary (variant, &error);
     if (!config) {
         g_warning ("Couldn't create IP config: '%s'", error->message);
         g_error_free (error);
diff --git a/libmm-glib/mm-bearer.h b/libmm-glib/mm-bearer.h
index 19b50f16..cf54695d 100644
--- a/libmm-glib/mm-bearer.h
+++ b/libmm-glib/mm-bearer.h
@@ -27,7 +27,6 @@
 #include <libmm-common.h>
 
 #include "mm-bearer-properties.h"
-#include "mm-bearer-ip-config.h"
 
 G_BEGIN_DECLS