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

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

14 files changed, 30 insertions, 31 deletions

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 6a55096b..01b87795 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -147,7 +147,7 @@ struct _MMBroadbandModemPrivate {
     /*<--- Modem Simple interface --->*/
     /* Properties */
     GObject *modem_simple_dbus_skeleton;
-    MMCommonSimpleProperties *modem_simple_status;
+    MMSimpleStatus *modem_simple_status;
 
     /*<--- Modem Location interface --->*/
     /* Properties */
@@ -6431,7 +6431,7 @@ initialize_step (InitializeContext *ctx)
          * so that interfaces add and bind the properties they want to export.
          */
         if (!ctx->self->priv->modem_simple_status)
-            ctx->self->priv->modem_simple_status = mm_common_simple_properties_new ();
+            ctx->self->priv->modem_simple_status = mm_simple_status_new ();
         /* Fall down to next step */
         ctx->step++;
 
diff --git a/src/mm-iface-modem-3gpp-ussd.c b/src/mm-iface-modem-3gpp-ussd.c
index a714b2d9..4e6b47f4 100644
--- a/src/mm-iface-modem-3gpp-ussd.c
+++ b/src/mm-iface-modem-3gpp-ussd.c
@@ -36,7 +36,7 @@ static GQuark supported_quark;
 
 void
 mm_iface_modem_3gpp_ussd_bind_simple_status (MMIfaceModem3gppUssd *self,
-                                             MMCommonSimpleProperties *status)
+                                             MMSimpleStatus *status)
 {
     /* Nothing shown in simple status */
 }
diff --git a/src/mm-iface-modem-3gpp-ussd.h b/src/mm-iface-modem-3gpp-ussd.h
index e8d25de6..3d99185f 100644
--- a/src/mm-iface-modem-3gpp-ussd.h
+++ b/src/mm-iface-modem-3gpp-ussd.h
@@ -155,6 +155,6 @@ void mm_iface_modem_3gpp_ussd_shutdown (MMIfaceModem3gppUssd *self);
 
 /* Bind properties for simple GetStatus() */
 void mm_iface_modem_3gpp_ussd_bind_simple_status (MMIfaceModem3gppUssd *self,
-                                                  MMCommonSimpleProperties *status);
+                                                  MMSimpleStatus *status);
 
 #endif /* MM_IFACE_MODEM_3GPP_USSD_H */
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index 84b12cbb..03a86967 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -44,7 +44,7 @@ static GQuark registration_check_context_quark;
 
 void
 mm_iface_modem_3gpp_bind_simple_status (MMIfaceModem3gpp *self,
-                                        MMCommonSimpleProperties *status)
+                                        MMSimpleStatus *status)
 {
     MmGdbusModem3gpp *skeleton;
 
@@ -53,15 +53,15 @@ mm_iface_modem_3gpp_bind_simple_status (MMIfaceModem3gpp *self,
                   NULL);
 
     g_object_bind_property (skeleton, "registration-state",
-                            status, MM_COMMON_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE,
+                            status, MM_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "operator-code",
-                            status, MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_CODE,
+                            status, MM_SIMPLE_PROPERTY_3GPP_OPERATOR_CODE,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "operator-name",
-                            status, MM_COMMON_SIMPLE_PROPERTY_3GPP_OPERATOR_NAME,
+                            status, MM_SIMPLE_PROPERTY_3GPP_OPERATOR_NAME,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_unref (skeleton);
diff --git a/src/mm-iface-modem-3gpp.h b/src/mm-iface-modem-3gpp.h
index 8c88c05c..3168399c 100644
--- a/src/mm-iface-modem-3gpp.h
+++ b/src/mm-iface-modem-3gpp.h
@@ -272,6 +272,6 @@ void     mm_iface_modem_3gpp_register_in_network        (MMIfaceModem3gpp *self,
 
 /* Bind properties for simple GetStatus() */
 void mm_iface_modem_3gpp_bind_simple_status (MMIfaceModem3gpp *self,
-                                             MMCommonSimpleProperties *status);
+                                             MMSimpleStatus *status);
 
 #endif /* MM_IFACE_MODEM_3GPP_H */
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 7c305178..c5983ddf 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -37,7 +37,7 @@ static GQuark registration_check_context_quark;
 
 void
 mm_iface_modem_cdma_bind_simple_status (MMIfaceModemCdma *self,
-                                        MMCommonSimpleProperties *status)
+                                        MMSimpleStatus *status)
 {
     MmGdbusModemCdma *skeleton;
 
@@ -45,21 +45,20 @@ mm_iface_modem_cdma_bind_simple_status (MMIfaceModemCdma *self,
                   MM_IFACE_MODEM_CDMA_DBUS_SKELETON, &skeleton,
                   NULL);
 
-
     g_object_bind_property (skeleton, "cdma1x-registration-state",
-                            status, MM_COMMON_SIMPLE_PROPERTY_CDMA_CDMA1X_REGISTRATION_STATE,
+                            status, MM_SIMPLE_PROPERTY_CDMA_CDMA1X_REGISTRATION_STATE,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "sid",
-                            status, MM_COMMON_SIMPLE_PROPERTY_CDMA_SID,
+                            status, MM_SIMPLE_PROPERTY_CDMA_SID,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "nid",
-                            status, MM_COMMON_SIMPLE_PROPERTY_CDMA_NID,
+                            status, MM_SIMPLE_PROPERTY_CDMA_NID,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "evdo-registration-state",
-                            status, MM_COMMON_SIMPLE_PROPERTY_CDMA_EVDO_REGISTRATION_STATE,
+                            status, MM_SIMPLE_PROPERTY_CDMA_EVDO_REGISTRATION_STATE,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_unref (skeleton);
diff --git a/src/mm-iface-modem-cdma.h b/src/mm-iface-modem-cdma.h
index 9de17860..f95c733f 100644
--- a/src/mm-iface-modem-cdma.h
+++ b/src/mm-iface-modem-cdma.h
@@ -212,6 +212,6 @@ gboolean mm_iface_modem_cdma_register_in_network_finish (MMIfaceModemCdma *self,
 
 /* Bind properties for simple GetStatus() */
 void mm_iface_modem_cdma_bind_simple_status (MMIfaceModemCdma *self,
-                                             MMCommonSimpleProperties *status);
+                                             MMSimpleStatus *status);
 
 #endif /* MM_IFACE_MODEM_CDMA_H */
diff --git a/src/mm-iface-modem-location.c b/src/mm-iface-modem-location.c
index 5ff3ef3d..a021a563 100644
--- a/src/mm-iface-modem-location.c
+++ b/src/mm-iface-modem-location.c
@@ -28,7 +28,7 @@ static GQuark location_context_quark;
 
 void
 mm_iface_modem_location_bind_simple_status (MMIfaceModemLocation *self,
-                                            MMCommonSimpleProperties *status)
+                                            MMSimpleStatus *status)
 {
 }
 
diff --git a/src/mm-iface-modem-location.h b/src/mm-iface-modem-location.h
index 4634fd1b..f18ebbb4 100644
--- a/src/mm-iface-modem-location.h
+++ b/src/mm-iface-modem-location.h
@@ -98,6 +98,6 @@ void mm_iface_modem_location_3gpp_update_lac_ci  (MMIfaceModemLocation *self,
 
 /* Bind properties for simple GetStatus() */
 void mm_iface_modem_location_bind_simple_status (MMIfaceModemLocation *self,
-                                                 MMCommonSimpleProperties *status);
+                                                 MMSimpleStatus *status);
 
 #endif /* MM_IFACE_MODEM_LOCATION_H */
diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c
index 6a30bd60..2545cdc0 100644
--- a/src/mm-iface-modem-messaging.c
+++ b/src/mm-iface-modem-messaging.c
@@ -33,7 +33,7 @@ static GQuark storage_context_quark;
 
 void
 mm_iface_modem_messaging_bind_simple_status (MMIfaceModemMessaging *self,
-                                            MMCommonSimpleProperties *status)
+                                             MMSimpleStatus *status)
 {
 }
 
diff --git a/src/mm-iface-modem-messaging.h b/src/mm-iface-modem-messaging.h
index 475a8001..c08bf131 100644
--- a/src/mm-iface-modem-messaging.h
+++ b/src/mm-iface-modem-messaging.h
@@ -159,7 +159,7 @@ void mm_iface_modem_messaging_shutdown (MMIfaceModemMessaging *self);
 
 /* Bind properties for simple GetStatus() */
 void mm_iface_modem_messaging_bind_simple_status (MMIfaceModemMessaging *self,
-                                                  MMCommonSimpleProperties *status);
+                                                  MMSimpleStatus *status);
 
 /* Report new SMS part */
 gboolean mm_iface_modem_messaging_take_part (MMIfaceModemMessaging *self,
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c
index 007ab529..5424e11d 100644
--- a/src/mm-iface-modem-simple.c
+++ b/src/mm-iface-modem-simple.c
@@ -753,18 +753,18 @@ handle_get_status (MmGdbusModemSimple *skeleton,
                    GDBusMethodInvocation *invocation,
                    MMIfaceModemSimple *self)
 {
-    MMCommonSimpleProperties *properties = NULL;
+    MMSimpleStatus *status = NULL;
     GVariant *dictionary;
 
     g_object_get (self,
-                  MM_IFACE_MODEM_SIMPLE_STATUS, &properties,
+                  MM_IFACE_MODEM_SIMPLE_STATUS, &status,
                   NULL);
 
-    dictionary = mm_common_simple_properties_get_dictionary (properties);
+    dictionary = mm_simple_status_get_dictionary (status);
     mm_gdbus_modem_simple_complete_get_status (skeleton, invocation, dictionary);
     g_variant_unref (dictionary);
 
-    g_object_unref (properties);
+    g_object_unref (status);
     return TRUE;
 }
 
@@ -845,7 +845,7 @@ iface_modem_simple_init (gpointer g_iface)
          g_param_spec_object (MM_IFACE_MODEM_SIMPLE_STATUS,
                               "Simple status",
                               "Compilation of status values",
-                              MM_TYPE_COMMON_SIMPLE_PROPERTIES,
+                              MM_TYPE_SIMPLE_STATUS,
                               G_PARAM_READWRITE));
 
     initialized = TRUE;
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 4eac0416..e3b823c5 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -44,7 +44,7 @@ static GQuark access_technologies_check_context_quark;
 
 void
 mm_iface_modem_bind_simple_status (MMIfaceModem *self,
-                                   MMCommonSimpleProperties *status)
+                                   MMSimpleStatus *status)
 {
     MmGdbusModem *skeleton;
 
@@ -53,19 +53,19 @@ mm_iface_modem_bind_simple_status (MMIfaceModem *self,
                   NULL);
 
     g_object_bind_property (skeleton, "state",
-                            status, MM_COMMON_SIMPLE_PROPERTY_STATE,
+                            status, MM_SIMPLE_PROPERTY_STATE,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "signal-quality",
-                            status, MM_COMMON_SIMPLE_PROPERTY_SIGNAL_QUALITY,
+                            status, MM_SIMPLE_PROPERTY_SIGNAL_QUALITY,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "bands",
-                            status, MM_COMMON_SIMPLE_PROPERTY_BANDS,
+                            status, MM_SIMPLE_PROPERTY_BANDS,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_bind_property (skeleton, "access-technologies",
-                            status, MM_COMMON_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES,
+                            status, MM_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
     g_object_unref (skeleton);
diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h
index 0800bb31..32afffc1 100644
--- a/src/mm-iface-modem.h
+++ b/src/mm-iface-modem.h
@@ -403,6 +403,6 @@ MMBearer *mm_iface_modem_create_bearer_finish (MMIfaceModem *self,
                                                GError **error);
 
 void mm_iface_modem_bind_simple_status (MMIfaceModem *self,
-                                        MMCommonSimpleProperties *status);
+                                        MMSimpleStatus *status);
 
 #endif /* MM_IFACE_MODEM_H */