aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-01-12 16:34:04 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-03-15 14:14:50 +0100
commit8c704ea7a25c2efc1927d63b42853a4d13b55965 (patch)
treef73cb1d489d682d2136ee62b5b55cf94ac24f50d
parentd2af326e1a4a6223930ae6af8c336c478a0437f5 (diff)
libmm-glib: prefix with '3gpp' the 3GPP-specific simple status properties
-rw-r--r--cli/mmcli-modem-simple.c6
-rw-r--r--libmm-glib/mm-modem-simple-status-properties.c6
-rw-r--r--libmm-glib/mm-modem-simple-status-properties.h7
3 files changed, 10 insertions, 9 deletions
diff --git a/cli/mmcli-modem-simple.c b/cli/mmcli-modem-simple.c
index 6b2d5624..5419b6b2 100644
--- a/cli/mmcli-modem-simple.c
+++ b/cli/mmcli-modem-simple.c
@@ -237,9 +237,9 @@ status_process_reply (MMModemSimpleStatusProperties *result,
VALIDATE_UNKNOWN (bands_str),
VALIDATE_UNKNOWN (access_tech_str),
mmcli_get_3gpp_registration_state_string (
- mm_modem_simple_status_properties_get_registration_state (result)),
- VALIDATE_UNKNOWN (mm_modem_simple_status_properties_get_operator_code (result)),
- VALIDATE_UNKNOWN (mm_modem_simple_status_properties_get_operator_name (result)));
+ mm_modem_simple_status_properties_get_3gpp_registration_state (result)),
+ VALIDATE_UNKNOWN (mm_modem_simple_status_properties_get_3gpp_operator_code (result)),
+ VALIDATE_UNKNOWN (mm_modem_simple_status_properties_get_3gpp_operator_name (result)));
g_free (access_tech_str);
g_free (bands_str);
diff --git a/libmm-glib/mm-modem-simple-status-properties.c b/libmm-glib/mm-modem-simple-status-properties.c
index 3d34bf7a..66cd5267 100644
--- a/libmm-glib/mm-modem-simple-status-properties.c
+++ b/libmm-glib/mm-modem-simple-status-properties.c
@@ -53,7 +53,7 @@ mm_modem_simple_status_properties_get_access_technologies (MMModemSimpleStatusPr
}
MMModem3gppRegistrationState
-mm_modem_simple_status_properties_get_registration_state (MMModemSimpleStatusProperties *self)
+mm_modem_simple_status_properties_get_3gpp_registration_state (MMModemSimpleStatusProperties *self)
{
g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self),
MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN);
@@ -62,7 +62,7 @@ mm_modem_simple_status_properties_get_registration_state (MMModemSimpleStatusPro
}
const gchar *
-mm_modem_simple_status_properties_get_operator_code (MMModemSimpleStatusProperties *self)
+mm_modem_simple_status_properties_get_3gpp_operator_code (MMModemSimpleStatusProperties *self)
{
g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), NULL);
@@ -70,7 +70,7 @@ mm_modem_simple_status_properties_get_operator_code (MMModemSimpleStatusProperti
}
const gchar *
-mm_modem_simple_status_properties_get_operator_name (MMModemSimpleStatusProperties *self)
+mm_modem_simple_status_properties_get_3gpp_operator_name (MMModemSimpleStatusProperties *self)
{
g_return_val_if_fail (MM_IS_MODEM_SIMPLE_STATUS_PROPERTIES (self), NULL);
diff --git a/libmm-glib/mm-modem-simple-status-properties.h b/libmm-glib/mm-modem-simple-status-properties.h
index 81ac8f48..4361cf2d 100644
--- a/libmm-glib/mm-modem-simple-status-properties.h
+++ b/libmm-glib/mm-modem-simple-status-properties.h
@@ -35,9 +35,10 @@ void mm_modem_simple_status_properties_get_bands
const MMModemBand **bands,
guint *n_bands);
MMModemAccessTechnology mm_modem_simple_status_properties_get_access_technologies (MMModemSimpleStatusProperties *self);
-MMModem3gppRegistrationState mm_modem_simple_status_properties_get_registration_state (MMModemSimpleStatusProperties *self);
-const gchar *mm_modem_simple_status_properties_get_operator_code (MMModemSimpleStatusProperties *self);
-const gchar *mm_modem_simple_status_properties_get_operator_name (MMModemSimpleStatusProperties *self);
+
+MMModem3gppRegistrationState mm_modem_simple_status_properties_get_3gpp_registration_state (MMModemSimpleStatusProperties *self);
+const gchar *mm_modem_simple_status_properties_get_3gpp_operator_code (MMModemSimpleStatusProperties *self);
+const gchar *mm_modem_simple_status_properties_get_3gpp_operator_name (MMModemSimpleStatusProperties *self);
G_END_DECLS