api,dbus: rename `AllowedBands' to just `Bands'

ModemManager will load:
  1) The list of supported bands. Note that this doesn't mean that any possible
     combination of bands is supported, as modems may support only specific
     combinations, but at least gives a rough idea of what the modem is capable
     of handling.

  2) The list of CURRENT bands. There is no such "Allowed" bands, as we do with
     modes, modems will have a specific set of bands being currently used, which
     will be reported in the `Bands' property.

If the modem allows modifying the list of bands to use, this can be done with
the `SetBands()' method. If the modem doesn't support using a specific
combination of bands, this method will report an error.

3 files changed, 102 insertions, 102 deletions

diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c
index b112472a..5d5afc15 100644
--- a/src/mm-iface-modem-simple.c
+++ b/src/mm-iface-modem-simple.c
@@ -172,7 +172,7 @@ typedef enum {
     CONNECTION_STEP_UNLOCK_CHECK,
     CONNECTION_STEP_ENABLE,
     CONNECTION_STEP_ALLOWED_MODES,
-    CONNECTION_STEP_ALLOWED_BANDS,
+    CONNECTION_STEP_BANDS,
     CONNECTION_STEP_REGISTER,
     CONNECTION_STEP_BEARER,
     CONNECTION_STEP_CONNECT,
@@ -286,14 +286,14 @@ set_allowed_modes_ready (MMBaseModem *self,
 }
 
 static void
-set_allowed_bands_ready (MMBaseModem *self,
-                         GAsyncResult *res,
-                         ConnectionContext *ctx)
+set_bands_ready (MMBaseModem *self,
+                 GAsyncResult *res,
+                 ConnectionContext *ctx)
 {
     GError *error = NULL;
 
-    if (!mm_iface_modem_set_allowed_bands_finish (MM_IFACE_MODEM (self), res, &error)) {
-        /* If setting allowed bands is unsupported, keep on */
+    if (!mm_iface_modem_set_bands_finish (MM_IFACE_MODEM (self), res, &error)) {
+        /* If setting bands is unsupported, keep on */
         if (!g_error_matches (error,
                               MM_CORE_ERROR,
                               MM_CORE_ERROR_UNSUPPORTED)) {
@@ -303,7 +303,7 @@ set_allowed_bands_ready (MMBaseModem *self,
         }
     }
 
-    /* Allowed bands set... almost there! */
+    /* Bands set... almost there! */
     ctx->step++;
     connection_step (ctx);
 }
@@ -448,27 +448,27 @@ connection_step (ConnectionContext *ctx)
         return;
     }
 
-    case CONNECTION_STEP_ALLOWED_BANDS: {
+    case CONNECTION_STEP_BANDS: {
         GArray *array;
-        const MMModemBand *allowed_bands = NULL;
-        guint n_allowed_bands = 0;
+        const MMModemBand *bands = NULL;
+        guint n_bands = 0;
         guint i;
 
-        mm_info ("Simple connect state (%d/%d): Allowed bands",
+        mm_info ("Simple connect state (%d/%d): Bands",
                  ctx->step, CONNECTION_STEP_LAST);
 
-        mm_common_connect_properties_get_allowed_bands (ctx->properties,
-                                                        &allowed_bands,
-                                                        &n_allowed_bands);
+        mm_common_connect_properties_get_bands (ctx->properties,
+                                                &bands,
+                                                &n_bands);
 
-        array = g_array_sized_new (FALSE, FALSE, sizeof (MMModemBand), n_allowed_bands);
-        for (i = 0; i < n_allowed_bands; i++)
-            g_array_insert_val (array, i, allowed_bands[i]);
+        array = g_array_sized_new (FALSE, FALSE, sizeof (MMModemBand), n_bands);
+        for (i = 0; i < n_bands; i++)
+            g_array_insert_val (array, i, bands[i]);
 
-        mm_iface_modem_set_allowed_bands (MM_IFACE_MODEM (ctx->self),
-                                          array,
-                                          (GAsyncReadyCallback)set_allowed_bands_ready,
-                                          ctx);
+        mm_iface_modem_set_bands (MM_IFACE_MODEM (ctx->self),
+                                  array,
+                                  (GAsyncReadyCallback)set_bands_ready,
+                                  ctx);
         g_array_unref (array);
         return;
     }
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 95c600de..d9060d7c 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -59,7 +59,7 @@ mm_iface_modem_bind_simple_status (MMIfaceModem *self,
                             status, MM_COMMON_SIMPLE_PROPERTY_SIGNAL_QUALITY,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
-    g_object_bind_property (skeleton, "allowed-bands",
+    g_object_bind_property (skeleton, "bands",
                             status, MM_COMMON_SIMPLE_PROPERTY_BANDS,
                             G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
@@ -1226,75 +1226,75 @@ handle_factory_reset (MmGdbusModem *skeleton,
 }
 
 /*****************************************************************************/
-/* ALLOWED BANDS */
+/* BANDS */
 
 typedef struct {
     MMIfaceModem *self;
     MmGdbusModem *skeleton;
     GSimpleAsyncResult *result;
-    GArray *allowed_bands_array;
-} SetAllowedBandsContext;
+    GArray *bands_array;
+} SetBandsContext;
 
 static void
-set_allowed_bands_context_complete_and_free (SetAllowedBandsContext *ctx)
+set_bands_context_complete_and_free (SetBandsContext *ctx)
 {
     g_simple_async_result_complete_in_idle (ctx->result);
     g_object_unref (ctx->result);
     g_object_unref (ctx->self);
     g_object_unref (ctx->skeleton);
-    g_array_unref (ctx->allowed_bands_array);
+    g_array_unref (ctx->bands_array);
     g_free (ctx);
 }
 
 gboolean
-mm_iface_modem_set_allowed_bands_finish (MMIfaceModem *self,
-                                         GAsyncResult *res,
-                                         GError **error)
+mm_iface_modem_set_bands_finish (MMIfaceModem *self,
+                                 GAsyncResult *res,
+                                 GError **error)
 {
     return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
 }
 
 static void
-set_allowed_bands_ready (MMIfaceModem *self,
-                         GAsyncResult *res,
-                         SetAllowedBandsContext *ctx)
+set_bands_ready (MMIfaceModem *self,
+                 GAsyncResult *res,
+                 SetBandsContext *ctx)
 {
     GError *error = NULL;
 
-    if (!MM_IFACE_MODEM_GET_INTERFACE (self)->set_allowed_bands_finish (self, res, &error))
+    if (!MM_IFACE_MODEM_GET_INTERFACE (self)->set_bands_finish (self, res, &error))
         g_simple_async_result_take_error (ctx->result, error);
     else {
-        mm_gdbus_modem_set_allowed_bands (ctx->skeleton,
-                                          mm_common_bands_garray_to_variant (ctx->allowed_bands_array));
+        mm_gdbus_modem_set_bands (ctx->skeleton,
+                                  mm_common_bands_garray_to_variant (ctx->bands_array));
         g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
     }
 
-    set_allowed_bands_context_complete_and_free (ctx);
+    set_bands_context_complete_and_free (ctx);
 }
 
 static gboolean
-validate_allowed_bands (const GArray *supported_bands_array,
-                        const GArray *allowed_bands_array,
-                        GError **error)
+validate_bands (const GArray *supported_bands_array,
+                const GArray *bands_array,
+                GError **error)
 {
     /* When the array has more than one element, there MUST NOT include ANY or
      * UNKNOWN */
-    if (allowed_bands_array->len > 1) {
+    if (bands_array->len > 1) {
         guint i;
 
-        for (i = 0; i < allowed_bands_array->len; i++) {
+        for (i = 0; i < bands_array->len; i++) {
             MMModemBand band;
 
-            band = g_array_index (allowed_bands_array, MMModemBand, i);
+            band = g_array_index (bands_array, MMModemBand, i);
             if (band == MM_MODEM_BAND_UNKNOWN ||
                 band == MM_MODEM_BAND_ANY) {
-                 g_set_error (error,
-                              MM_CORE_ERROR,
-                              MM_CORE_ERROR_INVALID_ARGS,
-                              "Wrong list of bands: "
-                              "'%s' should have been the only element in the list",
-                              mm_modem_band_get_string (band));
-                 return FALSE;
+                g_set_error (error,
+                             MM_CORE_ERROR,
+                             MM_CORE_ERROR_INVALID_ARGS,
+                             "Wrong list of bands: "
+                             "'%s' should have been the only element in the list",
+                             mm_modem_band_get_string (band));
+                return FALSE;
             }
 
             if (supported_bands_array->len > 1 ||
@@ -1330,18 +1330,18 @@ validate_allowed_bands (const GArray *supported_bands_array,
 }
 
 void
-mm_iface_modem_set_allowed_bands (MMIfaceModem *self,
-                                  GArray *bands_array,
-                                  GAsyncReadyCallback callback,
-                                  gpointer user_data)
+mm_iface_modem_set_bands (MMIfaceModem *self,
+                          GArray *bands_array,
+                          GAsyncReadyCallback callback,
+                          gpointer user_data)
 {
-    SetAllowedBandsContext *ctx;
+    SetBandsContext *ctx;
     GArray *supported_bands_array;
     GError *error = NULL;
 
     /* If setting allowed bands is not implemented, report an error */
-    if (!MM_IFACE_MODEM_GET_INTERFACE (self)->set_allowed_bands ||
-        !MM_IFACE_MODEM_GET_INTERFACE (self)->set_allowed_bands_finish) {
+    if (!MM_IFACE_MODEM_GET_INTERFACE (self)->set_bands ||
+        !MM_IFACE_MODEM_GET_INTERFACE (self)->set_bands_finish) {
         g_simple_async_report_error_in_idle (G_OBJECT (self),
                                              callback,
                                              user_data,
@@ -1352,60 +1352,60 @@ mm_iface_modem_set_allowed_bands (MMIfaceModem *self,
     }
 
     /* Setup context */
-    ctx = g_new0 (SetAllowedBandsContext, 1);
+    ctx = g_new0 (SetBandsContext, 1);
     ctx->self = g_object_ref (self);
     ctx->result = g_simple_async_result_new (G_OBJECT (self),
                                              callback,
                                              user_data,
-                                             mm_iface_modem_set_allowed_bands);
+                                             mm_iface_modem_set_bands);
     g_object_get (self,
                   MM_IFACE_MODEM_DBUS_SKELETON, &ctx->skeleton,
                   NULL);
-    ctx->allowed_bands_array = g_array_ref (bands_array);
+    ctx->bands_array = g_array_ref (bands_array);
 
     /* Get list of supported bands */
     supported_bands_array = (mm_common_bands_variant_to_garray (
                                  mm_gdbus_modem_get_supported_bands (ctx->skeleton)));
 
     /* Validate input list of bands */
-    if (!validate_allowed_bands (supported_bands_array,
-                                 ctx->allowed_bands_array,
-                                 &error)) {
+    if (!validate_bands (supported_bands_array,
+                         ctx->bands_array,
+                         &error)) {
         g_array_unref (supported_bands_array);
         g_simple_async_result_take_error (ctx->result, error);
-        set_allowed_bands_context_complete_and_free (ctx);
+        set_bands_context_complete_and_free (ctx);
         return;
     }
 
-    MM_IFACE_MODEM_GET_INTERFACE (self)->set_allowed_bands (
+    MM_IFACE_MODEM_GET_INTERFACE (self)->set_bands (
         self,
         bands_array,
-        (GAsyncReadyCallback)set_allowed_bands_ready,
+        (GAsyncReadyCallback)set_bands_ready,
         ctx);
 
     g_array_unref (supported_bands_array);
 }
 
 static void
-handle_set_allowed_bands_ready (MMIfaceModem *self,
-                                GAsyncResult *res,
-                                DbusCallContext *ctx)
+handle_set_bands_ready (MMIfaceModem *self,
+                        GAsyncResult *res,
+                        DbusCallContext *ctx)
 {
     GError *error = NULL;
 
-    if (!mm_iface_modem_set_allowed_bands_finish (self, res, &error))
+    if (!mm_iface_modem_set_bands_finish (self, res, &error))
         g_dbus_method_invocation_take_error (ctx->invocation, error);
     else
-        mm_gdbus_modem_complete_set_allowed_bands (ctx->skeleton,
-                                                   ctx->invocation);
+        mm_gdbus_modem_complete_set_bands (ctx->skeleton,
+                                           ctx->invocation);
     dbus_call_context_free (ctx);
 }
 
 static gboolean
-handle_set_allowed_bands (MmGdbusModem *skeleton,
-                          GDBusMethodInvocation *invocation,
-                          GVariant *bands_variant,
-                          MMIfaceModem *self)
+handle_set_bands (MmGdbusModem *skeleton,
+                  GDBusMethodInvocation *invocation,
+                  GVariant *bands_variant,
+                  MMIfaceModem *self)
 {
     MMModemState modem_state = MM_MODEM_STATE_UNKNOWN;
 
@@ -1435,12 +1435,12 @@ handle_set_allowed_bands (MmGdbusModem *skeleton,
         GArray *bands_array;
 
         bands_array = mm_common_bands_variant_to_garray (bands_variant);
-        mm_iface_modem_set_allowed_bands (self,
-                                          bands_array,
-                                          (GAsyncReadyCallback)handle_set_allowed_bands_ready,
-                                          dbus_call_context_new (skeleton,
-                                                                 invocation,
-                                                                 self));
+        mm_iface_modem_set_bands (self,
+                                  bands_array,
+                                  (GAsyncReadyCallback)handle_set_bands_ready,
+                                  dbus_call_context_new (skeleton,
+                                                         invocation,
+                                                         self));
         g_array_unref (bands_array);
         break;
       }
@@ -2579,8 +2579,8 @@ load_supported_bands_ready (MMIfaceModem *self,
     if (bands_array) {
         mm_gdbus_modem_set_supported_bands (ctx->skeleton,
                                             mm_common_bands_garray_to_variant (bands_array));
-        mm_gdbus_modem_set_allowed_bands (ctx->skeleton,
-                                          mm_common_bands_garray_to_variant (bands_array));
+        mm_gdbus_modem_set_bands (ctx->skeleton,
+                                  mm_common_bands_garray_to_variant (bands_array));
         g_array_unref (bands_array);
     }
 
@@ -2958,7 +2958,7 @@ interface_initialization_step (InitializationContext *ctx)
 
             /* Loading supported bands not implemented, default to ANY */
             mm_gdbus_modem_set_supported_bands (ctx->skeleton, mm_common_build_bands_any ());
-            mm_gdbus_modem_set_allowed_bands (ctx->skeleton, mm_common_build_bands_any ());
+            mm_gdbus_modem_set_bands (ctx->skeleton, mm_common_build_bands_any ());
         }
         g_array_unref (supported_bands);
 
@@ -3000,7 +3000,7 @@ interface_initialization_step (InitializationContext *ctx)
                           ctx->self);
         g_signal_connect (ctx->skeleton,
                           "handle-set-allowed-bands",
-                          G_CALLBACK (handle_set_allowed_bands),
+                          G_CALLBACK (handle_set_bands),
                           ctx->self);
         g_signal_connect (ctx->skeleton,
                           "handle-set-allowed-modes",
@@ -3067,7 +3067,7 @@ mm_iface_modem_initialize (MMIfaceModem *self,
         mm_gdbus_modem_set_allowed_modes (skeleton, MM_MODEM_MODE_NONE);
         mm_gdbus_modem_set_preferred_mode (skeleton, MM_MODEM_MODE_NONE);
         mm_gdbus_modem_set_supported_bands (skeleton, mm_common_build_bands_unknown ());
-        mm_gdbus_modem_set_allowed_bands (skeleton, mm_common_build_bands_unknown ());
+        mm_gdbus_modem_set_bands (skeleton, mm_common_build_bands_unknown ());
 
         /* Bind our State property */
         g_object_bind_property (self, MM_IFACE_MODEM_STATE,
diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h
index f5a16252..f9c3a80e 100644
--- a/src/mm-iface-modem.h
+++ b/src/mm-iface-modem.h
@@ -174,13 +174,13 @@ struct _MMIfaceModem {
                                      GError **error);
 
     /* Asynchronous allowed band setting operation */
-    void (*set_allowed_bands) (MMIfaceModem *self,
-                               GArray *bands_array,
-                               GAsyncReadyCallback callback,
-                               gpointer user_data);
-    gboolean (*set_allowed_bands_finish) (MMIfaceModem *self,
-                                          GAsyncResult *res,
-                                          GError **error);
+    void (*set_bands) (MMIfaceModem *self,
+                       GArray *bands_array,
+                       GAsyncReadyCallback callback,
+                       gpointer user_data);
+    gboolean (*set_bands_finish) (MMIfaceModem *self,
+                                  GAsyncResult *res,
+                                  GError **error);
 
     /* Asynchronous allowed mode setting operation */
     void (*set_allowed_modes) (MMIfaceModem *self,
@@ -356,14 +356,14 @@ gboolean mm_iface_modem_set_allowed_modes_finish (MMIfaceModem *self,
                                                   GAsyncResult *res,
                                                   GError **error);
 
-/* Allow setting allowed bands */
-void     mm_iface_modem_set_allowed_bands        (MMIfaceModem *self,
-                                                  GArray *bands_array,
-                                                  GAsyncReadyCallback callback,
-                                                  gpointer user_data);
-gboolean mm_iface_modem_set_allowed_bands_finish (MMIfaceModem *self,
-                                                  GAsyncResult *res,
-                                                  GError **error);
+/* Allow setting bands */
+void     mm_iface_modem_set_bands        (MMIfaceModem *self,
+                                          GArray *bands_array,
+                                          GAsyncReadyCallback callback,
+                                          gpointer user_data);
+gboolean mm_iface_modem_set_bands_finish (MMIfaceModem *self,
+                                          GAsyncResult *res,
+                                          GError **error);
 
 /* Allow creating bearers */
 void     mm_iface_modem_create_bearer         (MMIfaceModem *self,