diff options
Diffstat (limited to 'src/mm-modem-base.c')
| -rw-r--r-- | src/mm-modem-base.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/mm-modem-base.c b/src/mm-modem-base.c index ba4339b9..0c39d2c7 100644 --- a/src/mm-modem-base.c +++ b/src/mm-modem-base.c @@ -42,7 +42,7 @@ typedef struct { char *driver; char *plugin; char *device; - char *equipment_identity; + char *equipment_ident; char *unlock_required; guint32 unlock_retries; guint32 ip_method; @@ -194,16 +194,16 @@ mm_modem_base_get_valid (MMModemBase *self) } const char * -mm_modem_base_get_equipment_identity (MMModemBase *self) +mm_modem_base_get_equipment_identifier (MMModemBase *self) { g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (MM_IS_MODEM_BASE (self), NULL); - return MM_MODEM_BASE_GET_PRIVATE (self)->equipment_identity; + return MM_MODEM_BASE_GET_PRIVATE (self)->equipment_ident; } void -mm_modem_base_set_equipment_identity (MMModemBase *self, const char *equipment_identity) +mm_modem_base_set_equipment_identifier (MMModemBase *self, const char *ident) { MMModemBasePrivate *priv; const char *dbus_path; @@ -214,24 +214,22 @@ mm_modem_base_set_equipment_identity (MMModemBase *self, const char *equipment_i priv = MM_MODEM_BASE_GET_PRIVATE (self); /* Only do something if the value changes */ - if ( (priv->equipment_identity == equipment_identity) - || ( priv->equipment_identity - && equipment_identity - && !strcmp (priv->equipment_identity, equipment_identity))) + if ( (priv->equipment_ident == ident) + || (priv->equipment_ident && ident && !strcmp (priv->equipment_ident, ident))) return; - g_free (priv->equipment_identity); - priv->equipment_identity = g_strdup (equipment_identity); + g_free (priv->equipment_ident); + priv->equipment_ident = g_strdup (ident); dbus_path = (const char *) g_object_get_data (G_OBJECT (self), DBUS_PATH_TAG); if (dbus_path) { - if (priv->equipment_identity) - g_message ("Modem %s: EquipmentIdentity set (%s)", dbus_path, priv->equipment_identity); + if (priv->equipment_ident) + g_message ("Modem %s: Equipment identifier set (%s)", dbus_path, priv->equipment_ident); else - g_message ("Modem %s: EquipmentIdentity not set", dbus_path); + g_message ("Modem %s: Equipment identifier not set", dbus_path); } - g_object_notify (G_OBJECT (self), MM_MODEM_EQUIPMENT_IDENTITY); + g_object_notify (G_OBJECT (self), MM_MODEM_EQUIPMENT_IDENTIFIER); } const char * @@ -566,7 +564,7 @@ mm_modem_base_init (MMModemBase *self) MM_MODEM_ENABLED, MM_MODEM_DBUS_INTERFACE); mm_properties_changed_signal_register_property (G_OBJECT (self), - MM_MODEM_EQUIPMENT_IDENTITY, + MM_MODEM_EQUIPMENT_IDENTIFIER, MM_MODEM_DBUS_INTERFACE); mm_properties_changed_signal_register_property (G_OBJECT (self), MM_MODEM_UNLOCK_REQUIRED, @@ -622,7 +620,7 @@ set_property (GObject *object, guint prop_id, case MM_MODEM_PROP_VALID: case MM_MODEM_PROP_TYPE: case MM_MODEM_PROP_ENABLED: - case MM_MODEM_PROP_EQUIPMENT_IDENTITY: + case MM_MODEM_PROP_EQUIPMENT_IDENTIFIER: case MM_MODEM_PROP_UNLOCK_REQUIRED: case MM_MODEM_PROP_UNLOCK_RETRIES: break; @@ -666,8 +664,8 @@ get_property (GObject *object, guint prop_id, case MM_MODEM_PROP_ENABLED: g_value_set_boolean (value, is_enabled (priv->state)); break; - case MM_MODEM_PROP_EQUIPMENT_IDENTITY: - g_value_set_string (value, priv->equipment_identity); + case MM_MODEM_PROP_EQUIPMENT_IDENTIFIER: + g_value_set_string (value, priv->equipment_ident); break; case MM_MODEM_PROP_UNLOCK_REQUIRED: g_value_set_string (value, priv->unlock_required); @@ -693,7 +691,7 @@ finalize (GObject *object) g_free (priv->driver); g_free (priv->plugin); g_free (priv->device); - g_free (priv->equipment_identity); + g_free (priv->equipment_ident); g_free (priv->unlock_required); G_OBJECT_CLASS (mm_modem_base_parent_class)->finalize (object); @@ -748,8 +746,8 @@ mm_modem_base_class_init (MMModemBaseClass *klass) MM_MODEM_ENABLED); g_object_class_override_property (object_class, - MM_MODEM_PROP_EQUIPMENT_IDENTITY, - MM_MODEM_EQUIPMENT_IDENTITY); + MM_MODEM_PROP_EQUIPMENT_IDENTIFIER, + MM_MODEM_EQUIPMENT_IDENTIFIER); g_object_class_override_property (object_class, MM_MODEM_PROP_UNLOCK_REQUIRED, |