From 6c56db07fc3439f54ce6606e14be8963c62f12cc Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 4 Jan 2011 17:21:41 -0600 Subject: cdma: fix segfault by handling MEID property Also, MEID->Meid to follow standard D-Bus property semantics. --- src/mm-generic-cdma.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/mm-generic-cdma.c') diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index e453d1d8..386acdb7 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -68,6 +68,8 @@ typedef struct { guint poll_id; + char *meid; + MMModemCdmaRegistrationState cdma_1x_reg_state; MMModemCdmaRegistrationState evdo_reg_state; @@ -2279,6 +2281,9 @@ get_property (GObject *object, guint prop_id, case MM_MODEM_PROP_TYPE: g_value_set_uint (value, MM_MODEM_TYPE_CDMA); break; + case MM_MODEM_CDMA_PROP_MEID: + g_value_set_string (value, priv->meid); + break; case PROP_EVDO_REV0: g_value_set_boolean (value, priv->evdo_rev0); break; @@ -2331,6 +2336,10 @@ mm_generic_cdma_class_init (MMGenericCdmaClass *klass) MM_MODEM_PROP_TYPE, MM_MODEM_TYPE); + g_object_class_override_property (object_class, + MM_MODEM_CDMA_PROP_MEID, + MM_MODEM_CDMA_MEID); + g_object_class_install_property (object_class, PROP_EVDO_REV0, g_param_spec_boolean (MM_GENERIC_CDMA_EVDO_REV0, "EVDO rev0", -- cgit v1.2.3-70-g09d2