From ad95567e88eadf452c7e48a1d97bac4b741c206b Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sun, 8 Jan 2012 16:15:39 +0100 Subject: [PATCH] cli: print Rm protocol in bearer info --- cli/mmcli-bearer.c | 7 +++++-- cli/mmcli-common.c | 13 +++++++++++++ cli/mmcli-common.h | 4 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cli/mmcli-bearer.c b/cli/mmcli-bearer.c index 4015de39..96231c78 100644 --- a/cli/mmcli-bearer.c +++ b/cli/mmcli-bearer.c @@ -169,13 +169,16 @@ print_bearer_info (MMBearer *bearer) " | IP type: '%s'\n" " | user: '%s'\n" " | password: '%s'\n" - " | number: '%s'\n", + " | number: '%s'\n" + " | Rm protocol: '%s'\n", VALIDATE_NONE (mm_bearer_properties_get_apn (properties)), mm_bearer_properties_get_allow_roaming (properties) ? "allowed" : "forbidden", VALIDATE_NONE (mm_bearer_properties_get_ip_type (properties)), VALIDATE_NONE (mm_bearer_properties_get_user (properties)), VALIDATE_NONE (mm_bearer_properties_get_password (properties)), - VALIDATE_NONE (mm_bearer_properties_get_number (properties))); + VALIDATE_NONE (mm_bearer_properties_get_number (properties)), + VALIDATE_UNKNOWN (mmcli_get_cdma_rm_protocol_string ( + mm_bearer_properties_get_rm_protocol (properties)))); g_object_unref (properties); } diff --git a/cli/mmcli-common.c b/cli/mmcli-common.c index 732cbfc6..57f27a26 100644 --- a/cli/mmcli-common.c +++ b/cli/mmcli-common.c @@ -774,6 +774,19 @@ mmcli_get_3gpp_registration_state_string (MMModem3gppRegistrationState state) return value->value_nick; } +const gchar * +mmcli_get_cdma_rm_protocol_string (MMModemCdmaRmProtocol protocol) +{ + static GEnumClass *enum_class = NULL; + GEnumValue *value; + + if (!enum_class) + enum_class = G_ENUM_CLASS (g_type_class_ref (MM_TYPE_MODEM_CDMA_RM_PROTOCOL)); + + value = g_enum_get_value (enum_class, protocol); + return value->value_nick; +} + /* Common options */ static gchar *modem_str; static gchar *bearer_str; diff --git a/cli/mmcli-common.h b/cli/mmcli-common.h index 9add4889..be38aa64 100644 --- a/cli/mmcli-common.h +++ b/cli/mmcli-common.h @@ -69,7 +69,9 @@ const gchar *mmcli_get_state_string (MMModemState state); const gchar *mmcli_get_state_reason_string (MMModemStateChangeReason reason); const gchar *mmcli_get_lock_string (MMModemLock lock); const gchar *mmcli_get_3gpp_network_availability_string (MMModem3gppNetworkAvailability availability); -const gchar *mmcli_get_3gpp_registration_state_string (MMModem3gppRegistrationState state); +const gchar *mmcli_get_3gpp_registration_state_string (MMModem3gppRegistrationState state); +const gchar *mmcli_get_cdma_rm_protocol_string (MMModemCdmaRmProtocol protocol); + GOptionGroup *mmcli_get_common_option_group (void); const gchar *mmcli_get_common_modem_string (void);