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

5 files changed, 24 insertions, 23 deletions

diff --git a/src/mm-bearer-3gpp.c b/src/mm-bearer-3gpp.c
index d9e3ed37..7d803732 100644
--- a/src/mm-bearer-3gpp.c
+++ b/src/mm-bearer-3gpp.c
@@ -785,8 +785,7 @@ mm_bearer_3gpp_new_unique_path (void)
 }
 
 MMBearer *
-mm_bearer_3gpp_new_finish (MMIfaceModem3gpp *modem,
-                           GAsyncResult *res,
+mm_bearer_3gpp_new_finish (GAsyncResult *res,
                            GError **error)
 {
     if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error))
@@ -798,6 +797,7 @@ mm_bearer_3gpp_new_finish (MMIfaceModem3gpp *modem,
 void
 mm_bearer_3gpp_new (MMIfaceModem3gpp *modem,
                     MMCommonBearerProperties *properties,
+                    GCancellable *cancellable,
                     GAsyncReadyCallback callback,
                     gpointer user_data)
 {
diff --git a/src/mm-bearer-3gpp.h b/src/mm-bearer-3gpp.h
index 8cb205a9..93bea186 100644
--- a/src/mm-bearer-3gpp.h
+++ b/src/mm-bearer-3gpp.h
@@ -59,10 +59,10 @@ gchar *mm_bearer_3gpp_new_unique_path (void);
 /* Default 3GPP bearer creation implementation */
 void mm_bearer_3gpp_new (MMIfaceModem3gpp *modem,
                          MMCommonBearerProperties *properties,
+                         GCancellable *cancellable,
                          GAsyncReadyCallback callback,
                          gpointer user_data);
-MMBearer *mm_bearer_3gpp_new_finish (MMIfaceModem3gpp *modem,
-                                     GAsyncResult *res,
+MMBearer *mm_bearer_3gpp_new_finish (GAsyncResult *res,
                                      GError **error);
 
 const gchar *mm_bearer_3gpp_get_apn           (MMBearer3gpp *self);
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index ced88b79..7074a976 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -4660,8 +4660,8 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface)
     iface->register_in_network_finish = register_in_network_finish;
     iface->scan_networks = scan_networks;
     iface->scan_networks_finish = scan_networks_finish;
-    iface->create_3gpp_bearer = mm_bearer_3gpp_new;
-    iface->create_3gpp_bearer_finish = mm_bearer_3gpp_new_finish;
+    iface->bearer_new = mm_bearer_3gpp_new;
+    iface->bearer_new_finish = mm_bearer_3gpp_new_finish;
 }
 
 static void
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index 4837f2d5..54c02c58 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -369,10 +369,10 @@ mm_iface_modem_3gpp_create_bearer_finish (MMIfaceModem3gpp *self,
     MMModem3gppRegistrationState current_state;
     MMBearer *bearer;
 
-    g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->create_3gpp_bearer_finish != NULL);
-    bearer = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->create_3gpp_bearer_finish (self,
-                                                                                  res,
-                                                                                  error);
+    g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->bearer_new_finish != NULL);
+    bearer = MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->bearer_new_finish (res,
+                                                                          error);
+
     if (!bearer)
         return NULL;
 
@@ -405,11 +405,12 @@ mm_iface_modem_3gpp_create_bearer (MMIfaceModem3gpp *self,
                                    GAsyncReadyCallback callback,
                                    gpointer user_data)
 {
-    g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->create_3gpp_bearer != NULL);
-    MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->create_3gpp_bearer (self,
-                                                                  properties,
-                                                                  callback,
-                                                                  user_data);
+    g_assert (MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->bearer_new != NULL);
+    MM_IFACE_MODEM_3GPP_GET_INTERFACE (self)->bearer_new (self,
+                                                          properties,
+                                                          NULL,
+                                                          callback,
+                                                          user_data);
 }
 
 /*****************************************************************************/
diff --git a/src/mm-iface-modem-3gpp.h b/src/mm-iface-modem-3gpp.h
index e45934f6..b7523477 100644
--- a/src/mm-iface-modem-3gpp.h
+++ b/src/mm-iface-modem-3gpp.h
@@ -171,14 +171,14 @@ struct _MMIfaceModem3gpp {
                                      GAsyncResult *res,
                                      GError **error);
 
-    /* Create 3GPP bearer */
-    void (* create_3gpp_bearer) (MMIfaceModem3gpp *self,
-                                 MMCommonBearerProperties *properties,
-                                 GAsyncReadyCallback callback,
-                                 gpointer user_data);
-    MMBearer * (* create_3gpp_bearer_finish) (MMIfaceModem3gpp *self,
-                                              GAsyncResult *res,
-                                              GError **error);
+    /* New 3GPP bearer */
+    void (* bearer_new) (MMIfaceModem3gpp *self,
+                         MMCommonBearerProperties *properties,
+                         GCancellable *cancellable,
+                         GAsyncReadyCallback callback,
+                         gpointer user_data);
+    MMBearer * (* bearer_new_finish) (GAsyncResult *res,
+                                      GError **error);
 };
 
 GType mm_iface_modem_3gpp_get_type (void);