simple-status: deprecate 'subscription state' property

This property was already deprecated in libmm-glib and removed from
the daemon in 1.10, so the counterpart property in MMSimpleStatus
should also be deprecated.

2 files changed, 13 insertions, 16 deletions

diff --git a/libmm-glib/mm-simple-status.c b/libmm-glib/mm-simple-status.c
index 52e21f48..d022fd5b 100644
--- a/libmm-glib/mm-simple-status.c
+++ b/libmm-glib/mm-simple-status.c
@@ -73,8 +73,6 @@ struct _MMSimpleStatusPrivate {
     gchar *modem_3gpp_operator_code;
     /* 3GPP operator name, given only when registered, signature 's' */
     gchar *modem_3gpp_operator_name;
-    /* 3GPP subsctiption state, signature 'u' */
-    MMModem3gppSubscriptionState modem_3gpp_subscription_state;
 
     /* <--- From the Modem CDMA interface ---> */
     /* CDMA/CDMA1x registration state, signature 'u' */
@@ -255,6 +253,8 @@ mm_simple_status_get_3gpp_operator_name (MMSimpleStatus *self)
 
 /*****************************************************************************/
 
+#ifndef MM_DISABLE_DEPRECATED
+
 /**
  * mm_simple_status_get_3gpp_subscription_state:
  * @self: a #MMSimpleStatus.
@@ -264,15 +264,17 @@ mm_simple_status_get_3gpp_operator_name (MMSimpleStatus *self)
  * Returns: a #MMModem3gppSubscriptionState.
  *
  * Since: 1.0
+ * Deprecated: 1.12.0. The value of this property can only be obtained with
+ * operator specific logic (e.g. processing specific PCO info), and therefore
+ * it doesn't make sense to expose it in the ModemManager interface.
  */
 MMModem3gppSubscriptionState
 mm_simple_status_get_3gpp_subscription_state (MMSimpleStatus *self)
 {
-    g_return_val_if_fail (MM_IS_SIMPLE_STATUS (self), MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN);
-
-    return self->priv->modem_3gpp_subscription_state;
+    return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN;
 }
 
+#endif /* MM_DISABLE_DEPRECATED */
 
 /*****************************************************************************/
 
@@ -427,12 +429,6 @@ mm_simple_status_get_dictionary (MMSimpleStatus *self)
 
     }
 
-    if (self->priv->modem_3gpp_subscription_state)
-        g_variant_builder_add (&builder,
-                               "{sv}",
-                               MM_SIMPLE_PROPERTY_3GPP_SUBSCRIPTION_STATE,
-                               g_variant_new_uint32 (self->priv->modem_3gpp_subscription_state));
-
     return g_variant_ref_sink (g_variant_builder_end (&builder));
 }
 
@@ -472,7 +468,6 @@ mm_simple_status_new_from_dictionary (GVariant *dictionary,
         if (g_str_equal (key, MM_SIMPLE_PROPERTY_STATE) ||
             g_str_equal (key, MM_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES) ||
             g_str_equal (key, MM_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE) ||
-            g_str_equal (key, MM_SIMPLE_PROPERTY_3GPP_SUBSCRIPTION_STATE) ||
             g_str_equal (key, MM_SIMPLE_PROPERTY_CDMA_CDMA1X_REGISTRATION_STATE) ||
             g_str_equal (key, MM_SIMPLE_PROPERTY_CDMA_EVDO_REGISTRATION_STATE) ||
             g_str_equal (key, MM_SIMPLE_PROPERTY_CDMA_SID) ||
@@ -565,7 +560,7 @@ set_property (GObject *object,
         self->priv->modem_3gpp_operator_name = g_value_dup_string (value);
         break;
     case PROP_3GPP_SUBSCRIPTION_STATE:
-        self->priv->modem_3gpp_subscription_state = g_value_get_enum (value);
+        /* no-op */
         break;
     case PROP_CDMA_CDMA1X_REGISTRATION_STATE:
         self->priv->modem_cdma_cdma1x_registration_state = g_value_get_enum (value);
@@ -616,7 +611,7 @@ get_property (GObject *object,
         g_value_set_string (value, self->priv->modem_3gpp_operator_name);
         break;
     case PROP_3GPP_SUBSCRIPTION_STATE:
-        g_value_set_enum (value, self->priv->modem_3gpp_subscription_state);
+        g_value_set_enum (value, MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN);
         break;
     case PROP_CDMA_CDMA1X_REGISTRATION_STATE:
         g_value_set_enum (value, self->priv->modem_cdma_cdma1x_registration_state);
@@ -647,7 +642,6 @@ mm_simple_status_init (MMSimpleStatus *self)
     self->priv->state = MM_MODEM_STATE_UNKNOWN;
     self->priv->access_technologies = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN;
     self->priv->modem_3gpp_registration_state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN;
-    self->priv->modem_3gpp_subscription_state = MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN;
     self->priv->current_bands = g_variant_ref_sink (mm_common_build_bands_unknown ());
     self->priv->signal_quality = g_variant_ref_sink (g_variant_new ("(ub)", 0, 0));
     self->priv->modem_cdma_cdma1x_registration_state = MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN;
@@ -747,7 +741,7 @@ mm_simple_status_class_init (MMSimpleStatusClass *klass)
     properties[PROP_3GPP_SUBSCRIPTION_STATE] =
         g_param_spec_enum (MM_SIMPLE_PROPERTY_3GPP_SUBSCRIPTION_STATE,
                            "3GPP subscription state",
-                           "Subscription state of the account",
+                           "Subscription state of the account (deprecated)",
                            MM_TYPE_MODEM_3GPP_SUBSCRIPTION_STATE,
                            MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN,
                            G_PARAM_READWRITE);
diff --git a/libmm-glib/mm-simple-status.h b/libmm-glib/mm-simple-status.h
index 930e1f1b..ae1f5f6d 100644
--- a/libmm-glib/mm-simple-status.h
+++ b/libmm-glib/mm-simple-status.h
@@ -70,7 +70,10 @@ MMModemAccessTechnology       mm_simple_status_get_access_technologies (MMSimple
 MMModem3gppRegistrationState  mm_simple_status_get_3gpp_registration_state (MMSimpleStatus *self);
 const gchar                  *mm_simple_status_get_3gpp_operator_code      (MMSimpleStatus *self);
 const gchar                  *mm_simple_status_get_3gpp_operator_name      (MMSimpleStatus *self);
+
+#ifndef MM_DISABLE_DEPRECATED
 MMModem3gppSubscriptionState  mm_simple_status_get_3gpp_subscription_state (MMSimpleStatus *self);
+#endif
 
 MMModemCdmaRegistrationState mm_simple_status_get_cdma_cdma1x_registration_state (MMSimpleStatus *self);
 MMModemCdmaRegistrationState mm_simple_status_get_cdma_evdo_registration_state   (MMSimpleStatus *self);