diff options
Diffstat (limited to 'libmm-glib')
| -rw-r--r-- | libmm-glib/mm-modem.c | 150 | ||||
| -rw-r--r-- | libmm-glib/mm-modem.h | 32 | ||||
| -rw-r--r-- | libmm-glib/mm-simple-connect-properties.c | 66 | ||||
| -rw-r--r-- | libmm-glib/mm-simple-connect-properties.h | 4 | ||||
| -rw-r--r-- | libmm-glib/mm-simple-status.c | 62 | ||||
| -rw-r--r-- | libmm-glib/mm-simple-status.h | 10 |
6 files changed, 162 insertions, 162 deletions
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c index 3a30386c..af0f9fe1 100644 --- a/libmm-glib/mm-modem.c +++ b/libmm-glib/mm-modem.c @@ -54,10 +54,10 @@ struct _MMModemPrivate { guint supported_bands_id; GArray *supported_bands; - /* Bands */ - GMutex bands_mutex; - guint bands_id; - GArray *bands; + /* Current Bands */ + GMutex current_bands_mutex; + guint current_bands_id; + GArray *current_bands; }; /*****************************************************************************/ @@ -1093,74 +1093,74 @@ mm_modem_peek_supported_bands (MMModem *self, /*****************************************************************************/ static void -bands_updated (MMModem *self, - GParamSpec *pspec) +current_bands_updated (MMModem *self, + GParamSpec *pspec) { - g_mutex_lock (&self->priv->bands_mutex); + g_mutex_lock (&self->priv->current_bands_mutex); { GVariant *dictionary; - if (self->priv->bands) - g_array_unref (self->priv->bands); + if (self->priv->current_bands) + g_array_unref (self->priv->current_bands); - dictionary = mm_gdbus_modem_get_bands (MM_GDBUS_MODEM (self)); - self->priv->bands = (dictionary ? - mm_common_bands_variant_to_garray (dictionary) : - NULL); + dictionary = mm_gdbus_modem_get_current_bands (MM_GDBUS_MODEM (self)); + self->priv->current_bands = (dictionary ? + mm_common_bands_variant_to_garray (dictionary) : + NULL); } - g_mutex_unlock (&self->priv->bands_mutex); + g_mutex_unlock (&self->priv->current_bands_mutex); } static gboolean -ensure_internal_bands (MMModem *self, - MMModemBand **dup_bands, - guint *dup_bands_n) +ensure_internal_current_bands (MMModem *self, + MMModemBand **dup_bands, + guint *dup_bands_n) { gboolean ret; - g_mutex_lock (&self->priv->bands_mutex); + g_mutex_lock (&self->priv->current_bands_mutex); { /* If this is the first time ever asking for the array, setup the * update listener and the initial array, if any. */ - if (!self->priv->bands_id) { + if (!self->priv->current_bands_id) { GVariant *dictionary; - dictionary = mm_gdbus_modem_dup_bands (MM_GDBUS_MODEM (self)); + dictionary = mm_gdbus_modem_dup_current_bands (MM_GDBUS_MODEM (self)); if (dictionary) { - self->priv->bands = mm_common_bands_variant_to_garray (dictionary); + self->priv->current_bands = mm_common_bands_variant_to_garray (dictionary); g_variant_unref (dictionary); } /* No need to clear this signal connection when freeing self */ - self->priv->bands_id = + self->priv->current_bands_id = g_signal_connect (self, - "notify::bands", - G_CALLBACK (bands_updated), + "notify::current-bands", + G_CALLBACK (current_bands_updated), NULL); } - if (!self->priv->bands) + if (!self->priv->current_bands) ret = FALSE; else { ret = TRUE; if (dup_bands && dup_bands_n) { - *dup_bands_n = self->priv->bands->len; - if (self->priv->bands->len > 0) { - *dup_bands = g_malloc (sizeof (MMModemBand) * self->priv->bands->len); - memcpy (*dup_bands, self->priv->bands->data, sizeof (MMModemBand) * self->priv->bands->len); + *dup_bands_n = self->priv->current_bands->len; + if (self->priv->current_bands->len > 0) { + *dup_bands = g_malloc (sizeof (MMModemBand) * self->priv->current_bands->len); + memcpy (*dup_bands, self->priv->current_bands->data, sizeof (MMModemBand) * self->priv->current_bands->len); } else *dup_bands = NULL; } } } - g_mutex_unlock (&self->priv->bands_mutex); + g_mutex_unlock (&self->priv->current_bands_mutex); return ret; } /** - * mm_modem_get_bands: + * mm_modem_get_current_bands: * @self: A #MMModem. * @bands: (out) (array length=n_bands): Return location for the array of #MMModemBand values. The returned array should be freed with g_free() when no longer needed. * @n_bands: (out): Return location for the number of values in @bands. @@ -1173,19 +1173,19 @@ ensure_internal_bands (MMModem *self, * Returns: %TRUE if @bands and @n_bands are set, %FALSE otherwise. */ gboolean -mm_modem_get_bands (MMModem *self, - MMModemBand **bands, - guint *n_bands) +mm_modem_get_current_bands (MMModem *self, + MMModemBand **bands, + guint *n_bands) { g_return_val_if_fail (MM_IS_MODEM (self), FALSE); g_return_val_if_fail (bands != NULL, FALSE); g_return_val_if_fail (n_bands != NULL, FALSE); - return ensure_internal_bands (self, bands, n_bands); + return ensure_internal_current_bands (self, bands, n_bands); } /** - * mm_modem_peek_bands: + * mm_modem_peek_current_bands: * @self: A #MMModem. * @bands: (out) (array length=n_storages): Return location for the array of #MMModemBand values. Do not free the returned value, it is owned by @self. * @n_bands: (out): Return location for the number of values in @bands. @@ -1198,19 +1198,19 @@ mm_modem_get_bands (MMModem *self, * Returns: %TRUE if @bands and @n_bands are set, %FALSE otherwise. */ gboolean -mm_modem_peek_bands (MMModem *self, - const MMModemBand **bands, - guint *n_bands) +mm_modem_peek_current_bands (MMModem *self, + const MMModemBand **bands, + guint *n_bands) { g_return_val_if_fail (MM_IS_MODEM (self), FALSE); g_return_val_if_fail (bands != NULL, FALSE); g_return_val_if_fail (n_bands != NULL, FALSE); - if (!ensure_internal_bands (self, NULL, NULL)) + if (!ensure_internal_current_bands (self, NULL, NULL)) return FALSE; - *n_bands = self->priv->bands->len; - *bands = (MMModemBand *)self->priv->bands->data; + *n_bands = self->priv->current_bands->len; + *bands = (MMModemBand *)self->priv->current_bands->data; return TRUE; } @@ -2295,27 +2295,27 @@ mm_modem_set_allowed_modes_sync (MMModem *self, /*****************************************************************************/ /** - * mm_modem_set_bands_finish: + * mm_modem_set_current_bands_finish: * @self: A #MMModem. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_set_bands(). + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mm_modem_set_current_bands(). * @error: Return location for error or %NULL. * - * Finishes an operation started with mm_modem_set_bands(). + * Finishes an operation started with mm_modem_set_current_bands(). * * Returns: %TRUE if the bands were successfully set, %FALSE if @error is set. */ gboolean -mm_modem_set_bands_finish (MMModem *self, - GAsyncResult *res, - GError **error) +mm_modem_set_current_bands_finish (MMModem *self, + GAsyncResult *res, + GError **error) { g_return_val_if_fail (MM_IS_MODEM (self), FALSE); - return mm_gdbus_modem_call_set_bands_finish (MM_GDBUS_MODEM (self), res, error); + return mm_gdbus_modem_call_set_current_bands_finish (MM_GDBUS_MODEM (self), res, error); } /** - * mm_modem_set_bands: + * mm_modem_set_current_bands: * @self: A #MMModem. * @bands: An array of #MMModemBand values specifying which bands are allowed. * @n_bands: Number of elements in @bands. @@ -2327,29 +2327,29 @@ mm_modem_set_bands_finish (MMModem *self, * allowed to use when connecting to a network. * * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from. - * You can then call mm_modem_set_bands_finish() to get the result of the operation. + * You can then call mm_modem_set_current_bands_finish() to get the result of the operation. * - * See mm_modem_set_bands_sync() for the synchronous, blocking version of this method. + * See mm_modem_set_current_bands_sync() for the synchronous, blocking version of this method. */ void -mm_modem_set_bands (MMModem *self, - const MMModemBand *bands, - guint n_bands, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) +mm_modem_set_current_bands (MMModem *self, + const MMModemBand *bands, + guint n_bands, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { g_return_if_fail (MM_IS_MODEM (self)); - mm_gdbus_modem_call_set_bands (MM_GDBUS_MODEM (self), - mm_common_bands_array_to_variant (bands, n_bands), - cancellable, - callback, - user_data); + mm_gdbus_modem_call_set_current_bands (MM_GDBUS_MODEM (self), + mm_common_bands_array_to_variant (bands, n_bands), + cancellable, + callback, + user_data); } /** - * mm_modem_set_bands_sync: + * mm_modem_set_current_bands_sync: * @self: A #MMModem. * @bands: An array of #MMModemBand values specifying which bands are allowed. * @n_bands: Number of elements in @bands. @@ -2359,21 +2359,21 @@ mm_modem_set_bands (MMModem *self, * Synchronously sets the radio frequency and technology bands the device is currently * allowed to use when connecting to a network. * - * The calling thread is blocked until a reply is received. See mm_modem_set_bands() + * The calling thread is blocked until a reply is received. See mm_modem_set_current_bands() * for the asynchronous version of this method. * * Returns: %TRUE if the bands were successfully set, %FALSE if @error is set. */ gboolean -mm_modem_set_bands_sync (MMModem *self, - const MMModemBand *bands, - guint n_bands, - GCancellable *cancellable, - GError **error) +mm_modem_set_current_bands_sync (MMModem *self, + const MMModemBand *bands, + guint n_bands, + GCancellable *cancellable, + GError **error) { g_return_val_if_fail (MM_IS_MODEM (self), FALSE); - return (mm_gdbus_modem_call_set_bands_sync ( + return (mm_gdbus_modem_call_set_current_bands_sync ( MM_GDBUS_MODEM (self), mm_common_bands_array_to_variant (bands, n_bands), cancellable, @@ -2534,7 +2534,7 @@ mm_modem_init (MMModem *self) MMModemPrivate); g_mutex_init (&self->priv->unlock_retries_mutex); g_mutex_init (&self->priv->supported_bands_mutex); - g_mutex_init (&self->priv->bands_mutex); + g_mutex_init (&self->priv->current_bands_mutex); } static void @@ -2544,12 +2544,12 @@ finalize (GObject *object) g_mutex_clear (&self->priv->unlock_retries_mutex); g_mutex_clear (&self->priv->supported_bands_mutex); - g_mutex_clear (&self->priv->bands_mutex); + g_mutex_clear (&self->priv->current_bands_mutex); if (self->priv->supported_bands) g_array_unref (self->priv->supported_bands); - if (self->priv->bands) - g_array_unref (self->priv->bands); + if (self->priv->current_bands) + g_array_unref (self->priv->current_bands); G_OBJECT_CLASS (mm_modem_parent_class)->finalize (object); } diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h index 8aac7fc7..2ba6d82e 100644 --- a/libmm-glib/mm-modem.h +++ b/libmm-glib/mm-modem.h @@ -140,10 +140,10 @@ gboolean mm_modem_get_supported_bands (MMModem *self, MMModemBand **bands, guint *n_bands); -gboolean mm_modem_peek_bands (MMModem *self, +gboolean mm_modem_peek_current_bands (MMModem *self, const MMModemBand **bands, guint *n_bands); -gboolean mm_modem_get_bands (MMModem *self, +gboolean mm_modem_get_current_bands (MMModem *self, MMModemBand **bands, guint *n_bands); @@ -275,20 +275,20 @@ gboolean mm_modem_set_allowed_modes_sync (MMModem *self, GCancellable *cancellable, GError **error); -void mm_modem_set_bands (MMModem *self, - const MMModemBand *bands, - guint n_bands, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -gboolean mm_modem_set_bands_finish (MMModem *self, - GAsyncResult *res, - GError **error); -gboolean mm_modem_set_bands_sync (MMModem *self, - const MMModemBand *bands, - guint n_bands, - GCancellable *cancellable, - GError **error); +void mm_modem_set_current_bands (MMModem *self, + const MMModemBand *bands, + guint n_bands, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean mm_modem_set_current_bands_finish (MMModem *self, + GAsyncResult *res, + GError **error); +gboolean mm_modem_set_current_bands_sync (MMModem *self, + const MMModemBand *bands, + guint n_bands, + GCancellable *cancellable, + GError **error); void mm_modem_get_sim (MMModem *self, GCancellable *cancellable, diff --git a/libmm-glib/mm-simple-connect-properties.c b/libmm-glib/mm-simple-connect-properties.c index 5222e01c..fa476a19 100644 --- a/libmm-glib/mm-simple-connect-properties.c +++ b/libmm-glib/mm-simple-connect-properties.c @@ -35,7 +35,7 @@ G_DEFINE_TYPE (MMSimpleConnectProperties, mm_simple_connect_properties, G_TYPE_O #define PROPERTY_PIN "pin" #define PROPERTY_OPERATOR_ID "operator-id" -#define PROPERTY_BANDS "bands" +#define PROPERTY_CURRENT_BANDS "current-bands" #define PROPERTY_ALLOWED_MODES "allowed-modes" #define PROPERTY_PREFERRED_MODE "preferred-mode" @@ -45,9 +45,9 @@ struct _MMSimpleConnectPropertiesPrivate { /* Operator ID */ gchar *operator_id; /* Bands */ - gboolean bands_set; - MMModemBand *bands; - guint n_bands; + gboolean current_bands_set; + MMModemBand *current_bands; + guint n_current_bands; /* Modes */ gboolean allowed_modes_set; MMModemMode allowed_modes; @@ -129,7 +129,7 @@ mm_simple_connect_properties_get_operator_id (MMSimpleConnectProperties *self) /*****************************************************************************/ /** - * mm_simple_connect_properties_set_bands: + * mm_simple_connect_properties_set_current_bands: * @self: a #MMSimpleConnectProperties. * @bands: array of #MMModemBand values. * @n_bands: number of elements in @bands. @@ -137,23 +137,23 @@ mm_simple_connect_properties_get_operator_id (MMSimpleConnectProperties *self) * Sets the frequency bands to use. */ void -mm_simple_connect_properties_set_bands (MMSimpleConnectProperties *self, - const MMModemBand *bands, - guint n_bands) +mm_simple_connect_properties_set_current_bands (MMSimpleConnectProperties *self, + const MMModemBand *bands, + guint n_bands) { g_return_if_fail (MM_IS_SIMPLE_CONNECT_PROPERTIES (self)); - g_free (self->priv->bands); - self->priv->n_bands = n_bands; - self->priv->bands = g_new (MMModemBand, self->priv->n_bands); - memcpy (self->priv->bands, + g_free (self->priv->current_bands); + self->priv->n_current_bands = n_bands; + self->priv->current_bands = g_new (MMModemBand, self->priv->n_current_bands); + memcpy (self->priv->current_bands, bands, - sizeof (MMModemBand) * self->priv->n_bands); - self->priv->bands_set = TRUE; + sizeof (MMModemBand) * self->priv->n_current_bands); + self->priv->current_bands_set = TRUE; } /** - * mm_simple_connect_properties_get_bands: + * mm_simple_connect_properties_get_current_bands: * @self: a #MMSimpleConnectProperties. * @bands: (out): location for the array of #MMModemBand values. Do not free the returned value, it is owned by @self. * @n_bands: (out) number of elements in @bands. @@ -163,17 +163,17 @@ mm_simple_connect_properties_set_bands (MMSimpleConnectProperties *self, * Returns: %TRUE if @bands is set, %FALSE otherwise. */ gboolean -mm_simple_connect_properties_get_bands (MMSimpleConnectProperties *self, - const MMModemBand **bands, - guint *n_bands) +mm_simple_connect_properties_get_current_bands (MMSimpleConnectProperties *self, + const MMModemBand **bands, + guint *n_bands) { g_return_val_if_fail (MM_IS_SIMPLE_CONNECT_PROPERTIES (self), FALSE); g_return_val_if_fail (bands != NULL, FALSE); g_return_val_if_fail (n_bands != NULL, FALSE); - if (self->priv->bands_set) { - *bands = self->priv->bands; - *n_bands = self->priv->n_bands; + if (self->priv->current_bands_set) { + *bands = self->priv->current_bands; + *n_bands = self->priv->n_current_bands; return TRUE; } @@ -517,12 +517,12 @@ mm_simple_connect_properties_get_dictionary (MMSimpleConnectProperties *self) PROPERTY_OPERATOR_ID, g_variant_new_string (self->priv->operator_id)); - if (self->priv->bands) + if (self->priv->current_bands) g_variant_builder_add (&builder, "{sv}", - PROPERTY_BANDS, - mm_common_bands_array_to_variant (self->priv->bands, - self->priv->n_bands)); + PROPERTY_CURRENT_BANDS, + mm_common_bands_array_to_variant (self->priv->current_bands, + self->priv->n_current_bands)); if (self->priv->allowed_modes_set) { g_variant_builder_add (&builder, @@ -575,13 +575,13 @@ key_value_foreach (const gchar *key, mm_simple_connect_properties_set_pin (ctx->self, value); else if (g_str_equal (key, PROPERTY_OPERATOR_ID)) mm_simple_connect_properties_set_operator_id (ctx->self, value); - else if (g_str_equal (key, PROPERTY_BANDS)) { + else if (g_str_equal (key, PROPERTY_CURRENT_BANDS)) { MMModemBand *bands = NULL; guint n_bands = 0; mm_common_get_bands_from_string (value, &bands, &n_bands, &ctx->error); if (!ctx->error) { - mm_simple_connect_properties_set_bands (ctx->self, bands, n_bands); + mm_simple_connect_properties_set_current_bands (ctx->self, bands, n_bands); g_free (bands); } } else if (g_str_equal (key, PROPERTY_ALLOWED_MODES)) { @@ -696,11 +696,11 @@ mm_simple_connect_properties_new_from_dictionary (GVariant *dictionary, mm_simple_connect_properties_set_operator_id ( self, g_variant_get_string (value, NULL)); - else if (g_str_equal (key, PROPERTY_BANDS)) { + else if (g_str_equal (key, PROPERTY_CURRENT_BANDS)) { GArray *array; array = mm_common_bands_variant_to_garray (value); - mm_simple_connect_properties_set_bands ( + mm_simple_connect_properties_set_current_bands ( self, (MMModemBand *)array->data, array->len); @@ -781,9 +781,9 @@ mm_simple_connect_properties_init (MMSimpleConnectProperties *self) self->priv->bearer_properties = mm_bearer_properties_new (); self->priv->allowed_modes = MM_MODEM_MODE_ANY; self->priv->preferred_mode = MM_MODEM_MODE_NONE; - self->priv->bands = g_new (MMModemBand, 1); - self->priv->bands[0] = MM_MODEM_BAND_UNKNOWN; - self->priv->n_bands = 1; + self->priv->current_bands = g_new (MMModemBand, 1); + self->priv->current_bands[0] = MM_MODEM_BAND_UNKNOWN; + self->priv->n_current_bands = 1; } static void @@ -793,7 +793,7 @@ finalize (GObject *object) g_free (self->priv->pin); g_free (self->priv->operator_id); - g_free (self->priv->bands); + g_free (self->priv->current_bands); g_object_unref (self->priv->bearer_properties); G_OBJECT_CLASS (mm_simple_connect_properties_parent_class)->finalize (object); diff --git a/libmm-glib/mm-simple-connect-properties.h b/libmm-glib/mm-simple-connect-properties.h index 58bd5b4d..d82221da 100644 --- a/libmm-glib/mm-simple-connect-properties.h +++ b/libmm-glib/mm-simple-connect-properties.h @@ -63,7 +63,7 @@ void mm_simple_connect_properties_set_pin (MMSimpleConnectProperties * const gchar *pin); void mm_simple_connect_properties_set_operator_id (MMSimpleConnectProperties *self, const gchar *operator_id); -void mm_simple_connect_properties_set_bands (MMSimpleConnectProperties *self, +void mm_simple_connect_properties_set_current_bands (MMSimpleConnectProperties *self, const MMModemBand *bands, guint n_bands); void mm_simple_connect_properties_set_allowed_modes (MMSimpleConnectProperties *self, @@ -86,7 +86,7 @@ void mm_simple_connect_properties_set_number (MMSimpleConnectProperties * const gchar *mm_simple_connect_properties_get_pin (MMSimpleConnectProperties *self); const gchar *mm_simple_connect_properties_get_operator_id (MMSimpleConnectProperties *self); -gboolean mm_simple_connect_properties_get_bands (MMSimpleConnectProperties *self, +gboolean mm_simple_connect_properties_get_current_bands (MMSimpleConnectProperties *self, const MMModemBand **bands, guint *n_bands); gboolean mm_simple_connect_properties_get_allowed_modes (MMSimpleConnectProperties *self, diff --git a/libmm-glib/mm-simple-status.c b/libmm-glib/mm-simple-status.c index c9179e94..10dfee32 100644 --- a/libmm-glib/mm-simple-status.c +++ b/libmm-glib/mm-simple-status.c @@ -39,7 +39,7 @@ enum { PROP_0, PROP_STATE, PROP_SIGNAL_QUALITY, - PROP_BANDS, + PROP_CURRENT_BANDS, PROP_ACCESS_TECHNOLOGIES, PROP_3GPP_REGISTRATION_STATE, PROP_3GPP_OPERATOR_CODE, @@ -60,8 +60,8 @@ struct _MMSimpleStatusPrivate { /* Signal quality, given only when registered, signature '(ub)' */ GVariant *signal_quality; /* List of bands, given only when registered, signature: au */ - GVariant *bands; - GArray *bands_array; + GVariant *current_bands; + GArray *current_bands_array; /* Access technologies, given only when registered, signature: u */ MMModemAccessTechnology access_technologies; @@ -137,7 +137,7 @@ mm_simple_status_get_signal_quality (MMSimpleStatus *self, /*****************************************************************************/ /** - * mm_simple_status_get_bands: + * mm_simple_status_get_current_bands: * @self: a #MMSimpleStatus. * @bands: (out): location for an array of #MMModemBand values. Do not free the returned value, it is owned by @self. * @n_bands: (out): number of elements in @bands. @@ -145,17 +145,17 @@ mm_simple_status_get_signal_quality (MMSimpleStatus *self, * Gets the currently used frequency bands. */ void -mm_simple_status_get_bands (MMSimpleStatus *self, - const MMModemBand **bands, - guint *n_bands) +mm_simple_status_get_current_bands (MMSimpleStatus *self, + const MMModemBand **bands, + guint *n_bands) { g_return_if_fail (MM_IS_SIMPLE_STATUS (self)); - if (!self->priv->bands_array) - self->priv->bands_array = mm_common_bands_variant_to_garray (self->priv->bands); + if (!self->priv->current_bands_array) + self->priv->current_bands_array = mm_common_bands_variant_to_garray (self->priv->current_bands); - *n_bands = self->priv->bands_array->len; - *bands = (const MMModemBand *)self->priv->bands_array->data; + *n_bands = self->priv->current_bands_array->len; + *bands = (const MMModemBand *)self->priv->current_bands_array->data; } /*****************************************************************************/ @@ -329,8 +329,8 @@ mm_simple_status_get_dictionary (MMSimpleStatus *self) self->priv->signal_quality); g_variant_builder_add (&builder, "{sv}", - MM_SIMPLE_PROPERTY_BANDS, - self->priv->bands); + MM_SIMPLE_PROPERTY_CURRENT_BANDS, + self->priv->current_bands); g_variant_builder_add (&builder, "{sv}", MM_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES, @@ -428,7 +428,7 @@ mm_simple_status_new_from_dictionary (GVariant *dictionary, g_object_set (properties, key, g_variant_get_string (value, NULL), NULL); - } else if (g_str_equal (key, MM_SIMPLE_PROPERTY_BANDS) || + } else if (g_str_equal (key, MM_SIMPLE_PROPERTY_CURRENT_BANDS) || g_str_equal (key, MM_SIMPLE_PROPERTY_SIGNAL_QUALITY)) { /* remaining complex types, as variant */ g_object_set (properties, @@ -482,14 +482,14 @@ set_property (GObject *object, g_variant_unref (self->priv->signal_quality); self->priv->signal_quality = g_value_dup_variant (value); break; - case PROP_BANDS: - if (self->priv->bands) - g_variant_unref (self->priv->bands); - if (self->priv->bands_array) { - g_array_unref (self->priv->bands_array); - self->priv->bands_array = NULL; + case PROP_CURRENT_BANDS: + if (self->priv->current_bands) + g_variant_unref (self->priv->current_bands); + if (self->priv->current_bands_array) { + g_array_unref (self->priv->current_bands_array); + self->priv->current_bands_array = NULL; } - self->priv->bands = g_value_dup_variant (value); + self->priv->current_bands = g_value_dup_variant (value); break; case PROP_ACCESS_TECHNOLOGIES: self->priv->access_technologies = g_value_get_flags (value); @@ -538,8 +538,8 @@ get_property (GObject *object, case PROP_SIGNAL_QUALITY: g_value_set_variant (value, self->priv->signal_quality); break; - case PROP_BANDS: - g_value_set_variant (value, self->priv->bands); + case PROP_CURRENT_BANDS: + g_value_set_variant (value, self->priv->current_bands); break; case PROP_ACCESS_TECHNOLOGIES: g_value_set_flags (value, self->priv->access_technologies); @@ -582,7 +582,7 @@ mm_simple_status_init (MMSimpleStatus *self) self->priv->state = MM_MODEM_STATE_UNKNOWN; self->priv->access_technologies = MM_MODEM_ACCESS_TECHNOLOGY_UNKNOWN; self->priv->modem_3gpp_registration_state = MM_MODEM_3GPP_REGISTRATION_STATE_UNKNOWN; - self->priv->bands = g_variant_ref_sink (mm_common_build_bands_unknown ()); + self->priv->current_bands = g_variant_ref_sink (mm_common_build_bands_unknown ()); self->priv->signal_quality = g_variant_ref_sink (g_variant_new ("(ub)", 0, 0)); self->priv->modem_cdma_cdma1x_registration_state = MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN; self->priv->modem_cdma_evdo_registration_state = MM_MODEM_CDMA_REGISTRATION_STATE_UNKNOWN; @@ -596,9 +596,9 @@ finalize (GObject *object) MMSimpleStatus *self = MM_SIMPLE_STATUS (object); g_variant_unref (self->priv->signal_quality); - g_variant_unref (self->priv->bands); - if (self->priv->bands_array) - g_array_unref (self->priv->bands_array); + g_variant_unref (self->priv->current_bands); + if (self->priv->current_bands_array) + g_array_unref (self->priv->current_bands_array); g_free (self->priv->modem_3gpp_operator_code); g_free (self->priv->modem_3gpp_operator_name); @@ -635,14 +635,14 @@ mm_simple_status_class_init (MMSimpleStatusClass *klass) G_PARAM_READWRITE); g_object_class_install_property (object_class, PROP_SIGNAL_QUALITY, properties[PROP_SIGNAL_QUALITY]); - properties[PROP_BANDS] = - g_param_spec_variant (MM_SIMPLE_PROPERTY_BANDS, - "Bands", + properties[PROP_CURRENT_BANDS] = + g_param_spec_variant (MM_SIMPLE_PROPERTY_CURRENT_BANDS, + "Current Bands", "Frequency bands used by the modem", G_VARIANT_TYPE ("au"), NULL, G_PARAM_READWRITE); - g_object_class_install_property (object_class, PROP_BANDS, properties[PROP_BANDS]); + g_object_class_install_property (object_class, PROP_CURRENT_BANDS, properties[PROP_CURRENT_BANDS]); properties[PROP_ACCESS_TECHNOLOGIES] = g_param_spec_flags (MM_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES, diff --git a/libmm-glib/mm-simple-status.h b/libmm-glib/mm-simple-status.h index f61a34cc..8292fdb3 100644 --- a/libmm-glib/mm-simple-status.h +++ b/libmm-glib/mm-simple-status.h @@ -58,10 +58,10 @@ GType mm_simple_status_get_type (void); MMModemState mm_simple_status_get_state (MMSimpleStatus *self); guint32 mm_simple_status_get_signal_quality (MMSimpleStatus *self, - gboolean *recent); -void mm_simple_status_get_bands (MMSimpleStatus *self, - const MMModemBand **bands, - guint *n_bands); + gboolean *recent); +void mm_simple_status_get_current_bands (MMSimpleStatus *self, + const MMModemBand **bands, + guint *n_bands); MMModemAccessTechnology mm_simple_status_get_access_technologies (MMSimpleStatus *self); MMModem3gppRegistrationState mm_simple_status_get_3gpp_registration_state (MMSimpleStatus *self); @@ -82,7 +82,7 @@ guint mm_simple_status_get_cdma_nid #define MM_SIMPLE_PROPERTY_STATE "state" #define MM_SIMPLE_PROPERTY_SIGNAL_QUALITY "signal-quality" -#define MM_SIMPLE_PROPERTY_BANDS "bands" +#define MM_SIMPLE_PROPERTY_CURRENT_BANDS "current-bands" #define MM_SIMPLE_PROPERTY_ACCESS_TECHNOLOGIES "access-technologies" #define MM_SIMPLE_PROPERTY_3GPP_REGISTRATION_STATE "m3gpp-registration-state" |