bearer-cdma: avoid the need of the modem object during new_finish()

5 files changed, 24 insertions, 24 deletions

diff --git a/src/mm-bearer-cdma.c b/src/mm-bearer-cdma.c
index 347b48fd..080d76a8 100644
--- a/src/mm-bearer-cdma.c
+++ b/src/mm-bearer-cdma.c
@@ -105,8 +105,7 @@ mm_bearer_cdma_new_unique_path (void)
 /*****************************************************************************/
 
 MMBearer *
-mm_bearer_cdma_new_finish (MMIfaceModemCdma *modem,
-                           GAsyncResult *res,
+mm_bearer_cdma_new_finish (GAsyncResult *res,
                            GError **error)
 {
     if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
@@ -118,6 +117,7 @@ mm_bearer_cdma_new_finish (MMIfaceModemCdma *modem,
 void
 mm_bearer_cdma_new (MMIfaceModemCdma *modem,
                     MMCommonBearerProperties *properties,
+                    GCancellable *cancellable,
                     GAsyncReadyCallback callback,
                     gpointer user_data)
 {
diff --git a/src/mm-bearer-cdma.h b/src/mm-bearer-cdma.h
index cbdd9902..35ec63ff 100644
--- a/src/mm-bearer-cdma.h
+++ b/src/mm-bearer-cdma.h
@@ -57,10 +57,10 @@ gchar *mm_bearer_cdma_new_unique_path (void);
 /* Default CDMA bearer creation implementation */
 void mm_bearer_cdma_new (MMIfaceModemCdma *modem,
                          MMCommonBearerProperties *properties,
+                         GCancellable *cancellable,
                          GAsyncReadyCallback callback,
                          gpointer user_data);
-MMBearer *mm_bearer_cdma_new_finish (MMIfaceModemCdma *modem,
-                                     GAsyncResult *res,
+MMBearer *mm_bearer_cdma_new_finish (GAsyncResult *res,
                                      GError **error);
 
 guint mm_bearer_cdma_get_rm_protocol (MMBearerCdma *self);
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 7074a976..2e83ecbb 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -4686,8 +4686,8 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
     iface->get_detailed_registration_state_finish = get_detailed_registration_state_finish;
 
     /* Additional actions */
-    iface->create_cdma_bearer = mm_bearer_cdma_new;
-    iface->create_cdma_bearer_finish = mm_bearer_cdma_new_finish;
+    iface->bearer_new = mm_bearer_cdma_new;
+    iface->bearer_new_finish = mm_bearer_cdma_new_finish;
 }
 
 static void
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 732e4e46..53ab025f 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -381,14 +381,13 @@ mm_iface_modem_cdma_create_bearer_finish (MMIfaceModemCdma *self,
     MMModemCdmaRegistrationState evdo_current_state;
     MMBearer *bearer;
 
-    g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer_finish != NULL);
-    bearer = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer_finish (self,
-                                                                                  res,
-                                                                                  error);
+    g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new_finish != NULL);
+    bearer = MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new_finish (res,
+                                                                          error);
+
     if (!bearer)
         return NULL;
 
-
     g_object_get (self,
                   MM_IFACE_MODEM_CDMA_CDMA1X_REGISTRATION_STATE, &cdma1x_current_state,
                   MM_IFACE_MODEM_CDMA_EVDO_REGISTRATION_STATE, &evdo_current_state,
@@ -421,11 +420,12 @@ mm_iface_modem_cdma_create_bearer (MMIfaceModemCdma *self,
                                    GAsyncReadyCallback callback,
                                    gpointer user_data)
 {
-    g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer != NULL);
-    MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->create_cdma_bearer (self,
-                                                                  properties,
-                                                                  callback,
-                                                                  user_data);
+    g_assert (MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new != NULL);
+    MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->bearer_new (self,
+                                                          properties,
+                                                          NULL,
+                                                          callback,
+                                                          user_data);
 }
 
 /*****************************************************************************/
diff --git a/src/mm-iface-modem-cdma.h b/src/mm-iface-modem-cdma.h
index 59c3f2f5..1a297ae5 100644
--- a/src/mm-iface-modem-cdma.h
+++ b/src/mm-iface-modem-cdma.h
@@ -140,14 +140,14 @@ struct _MMIfaceModemCdma {
                                                          MMModemCdmaRegistrationState *detailed_evdo_state,
                                                          GError **error);
 
-    /* Create CDMA bearer */
-    void (* create_cdma_bearer) (MMIfaceModemCdma *self,
-                                 MMCommonBearerProperties *properties,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);
-    MMBearer * (* create_cdma_bearer_finish) (MMIfaceModemCdma *self,
-                                              GAsyncResult *res,
-                                              GError **error);
+    /* New CDMA bearer */
+    void (* bearer_new) (MMIfaceModemCdma *self,
+                         MMCommonBearerProperties *properties,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);
+    MMBearer * (* bearer_new_finish) (GAsyncResult *res,
+                                      GError **error);
 };
 
 GType mm_iface_modem_cdma_get_type (void);