SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: EquipmentIdentity -> EquipmentIdentifier

Browse Source
This commit is contained in:
Dan Williams
2010-06-22 17:14:13 -07:00
parent 8873c0a7dc
commit 88c538314a
7 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
introspection/mm-modem.xml
+2 -2
View File
@@ -113,9 +113,9 @@
</tp:docstring>
</property>
<property name="EquipmentIdentity" type="s" access="read">
<property name="EquipmentIdentifier" type="s" access="read">
<tp:docstring>
The EquipmentIdentity of the device. This will be the IMEI number for
The identity of the device. This will be the IMEI number for
GSM devices and the hex-format ESN/MEID for CDMA devices.
</tp:docstring>
</property>
src/mm-generic-cdma.c
+1 -1
View File
@@ -131,7 +131,7 @@ get_esn_cb (MMModem *modem,
gpointer user_data)
{
if (modem) {
mm_modem_base_set_equipment_identity (MM_MODEM_BASE (modem), error ? "" : result);
mm_modem_base_set_equipment_identifier (MM_MODEM_BASE (modem), error ? "" : result);
mm_serial_port_close (MM_SERIAL_PORT (MM_GENERIC_CDMA_GET_PRIVATE (modem)->primary));
check_valid (MM_GENERIC_CDMA (modem));
}
src/mm-generic-gsm.c
+1 -1
View File
@@ -299,7 +299,7 @@ get_imei_cb (MMModem *modem,
gpointer user_data)
{
if (modem) {
mm_modem_base_set_equipment_identity (MM_MODEM_BASE (modem), error ? "" : result);
mm_modem_base_set_equipment_identifier (MM_MODEM_BASE (modem), error ? "" : result);
mm_serial_port_close (MM_SERIAL_PORT (MM_GENERIC_GSM_GET_PRIVATE (modem)->primary));
}
}
src/mm-modem-base.c
+19 -21
View File
@@ -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,
src/mm-modem-base.h
+3 -3
View File
@@ -62,10 +62,10 @@ void mm_modem_base_set_valid (MMModemBase *self,
gboolean mm_modem_base_get_valid (MMModemBase *self);
const char *mm_modem_base_get_equipment_identity (MMModemBase *self);
const char *mm_modem_base_get_equipment_identifier (MMModemBase *self);
void mm_modem_base_set_equipment_identity (MMModemBase *self,
const char *equipment_identity);
void mm_modem_base_set_equipment_identifier (MMModemBase *self,
const char *ident);
const char *mm_modem_base_get_unlock_required (MMModemBase *self);
src/mm-modem.c
+3 -3
View File
@@ -805,9 +805,9 @@ mm_modem_init (gpointer g_iface)
g_object_interface_install_property
(g_iface,
g_param_spec_string (MM_MODEM_EQUIPMENT_IDENTITY,
"EquipmentIdentiy",
"The equipment identity of the device",
g_param_spec_string (MM_MODEM_EQUIPMENT_IDENTIFIER,
"EquipmentIdentifier",
"The equipment identifier of the device",
NULL,
G_PARAM_READABLE));
src/mm-modem.h
+2 -2
View File
@@ -58,7 +58,7 @@ typedef enum {
#define MM_MODEM_TYPE "type"
#define MM_MODEM_IP_METHOD "ip-method"
#define MM_MODEM_ENABLED "enabled"
#define MM_MODEM_EQUIPMENT_IDENTITY "equipment-identity"
#define MM_MODEM_EQUIPMENT_IDENTIFIER "equipment-identifier"
#define MM_MODEM_UNLOCK_REQUIRED "unlock-required"
#define MM_MODEM_UNLOCK_RETRIES "unlock-retries"
#define MM_MODEM_VALID "valid" /* not exported */
@@ -85,7 +85,7 @@ typedef enum {
MM_MODEM_PROP_PLUGIN, /* Not exported */
MM_MODEM_PROP_STATE, /* Not exported */
MM_MODEM_PROP_ENABLED,
MM_MODEM_PROP_EQUIPMENT_IDENTITY,
MM_MODEM_PROP_EQUIPMENT_IDENTIFIER,
MM_MODEM_PROP_UNLOCK_REQUIRED,
MM_MODEM_PROP_UNLOCK_RETRIES
} MMModemProp;