aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-10-09 17:45:43 +0200
committerAleksander Morgado <aleksander@lanedo.com>2013-03-22 08:11:00 +0100
commit3e33f1bc4dd925da6c52191aa953f64e1cd22de2 (patch)
tree9a038e79c350d24b574e04773d6cee42d7031774
parent9367f239db5b64f560e02575335b176c0a38024b (diff)
api,introspection: new `ActivationState' property in the CDMA interface
-rw-r--r--docs/reference/libmm-glib/libmm-glib-sections.txt3
-rw-r--r--introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml8
-rw-r--r--libmm-glib/mm-modem-cdma.c18
-rw-r--r--libmm-glib/mm-modem-cdma.h1
4 files changed, 30 insertions, 0 deletions
diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt
index 87b840ed..7fed42c1 100644
--- a/docs/reference/libmm-glib/libmm-glib-sections.txt
+++ b/docs/reference/libmm-glib/libmm-glib-sections.txt
@@ -288,6 +288,7 @@ mm_modem_cdma_get_nid
mm_modem_cdma_get_sid
mm_modem_cdma_get_cdma1x_registration_state
mm_modem_cdma_get_evdo_registration_state
+mm_modem_cdma_get_activation_state
<SUBSECTION Methods>
mm_modem_cdma_activate
mm_modem_cdma_activate_finish
@@ -1579,6 +1580,7 @@ MmGdbusModemCdmaIface
<SUBSECTION Getters>
mm_gdbus_modem_cdma_get_cdma1x_registration_state
mm_gdbus_modem_cdma_get_evdo_registration_state
+mm_gdbus_modem_cdma_get_activation_state
mm_gdbus_modem_cdma_get_esn
mm_gdbus_modem_cdma_dup_esn
mm_gdbus_modem_cdma_get_meid
@@ -1593,6 +1595,7 @@ mm_gdbus_modem_cdma_call_activate_manual
mm_gdbus_modem_cdma_call_activate_manual_finish
mm_gdbus_modem_cdma_call_activate_manual_sync
<SUBSECTION Private>
+mm_gdbus_modem_cdma_set_activation_state
mm_gdbus_modem_cdma_set_cdma1x_registration_state
mm_gdbus_modem_cdma_set_esn
mm_gdbus_modem_cdma_set_evdo_registration_state
diff --git a/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
index 0155ab0d..11808b7f 100644
--- a/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
+++ b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
@@ -62,6 +62,14 @@
</signal>
<!--
+ ActivationState:
+
+ A <link linkend="MMModemCdmaActivationState">MMModemCdmaActivationState</link>
+ value specifying the state of the activation in the 3GPP2 network.
+ -->
+ <property name="ActivationState" type="u" access="read" />
+
+ <!--
Meid:
The modem's <ulink url="http://en.wikipedia.org/wiki/MEID">Mobile Equipment Identifier</ulink>.
diff --git a/libmm-glib/mm-modem-cdma.c b/libmm-glib/mm-modem-cdma.c
index e12c080b..6f042c03 100644
--- a/libmm-glib/mm-modem-cdma.c
+++ b/libmm-glib/mm-modem-cdma.c
@@ -248,6 +248,24 @@ mm_modem_cdma_get_evdo_registration_state (MMModemCdma *self)
/*****************************************************************************/
/**
+ * mm_modem_cdma_get_activation_state:
+ * @self: A #MMModemCdma.
+ *
+ * Gets the state of the activation in the 3GPP2 network.
+ *
+ * Returns: a #MMModemCdmaActivationState.
+ */
+MMModemCdmaActivationState
+mm_modem_cdma_get_activation_state (MMModemCdma *self)
+{
+ g_return_val_if_fail (MM_IS_MODEM_CDMA (self), MM_MODEM_CDMA_ACTIVATION_STATE_UNKNOWN);
+
+ return mm_gdbus_modem_cdma_get_activation_state (MM_GDBUS_MODEM_CDMA (self));
+}
+
+/*****************************************************************************/
+
+/**
* mm_modem_cdma_activate_finish:
* @self: A #MMModemCdma.
* @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_cdma_activate().
diff --git a/libmm-glib/mm-modem-cdma.h b/libmm-glib/mm-modem-cdma.h
index cb927d7e..8c7cb9cf 100644
--- a/libmm-glib/mm-modem-cdma.h
+++ b/libmm-glib/mm-modem-cdma.h
@@ -90,6 +90,7 @@ guint mm_modem_cdma_get_nid (MMModemCdma *self);
MMModemCdmaRegistrationState mm_modem_cdma_get_cdma1x_registration_state (MMModemCdma *self);
MMModemCdmaRegistrationState mm_modem_cdma_get_evdo_registration_state (MMModemCdma *self);
+MMModemCdmaActivationState mm_modem_cdma_get_activation_state (MMModemCdma *self);
void mm_modem_cdma_activate (MMModemCdma *self,
const gchar *carrier,