1 files changed, 12 insertions, 12 deletions

diff --git a/src/mm-bearer-list.c b/src/mm-bearer-list.c
index ef1f8399..14477419 100644
--- a/src/mm-bearer-list.c
+++ b/src/mm-bearer-list.c
@@ -78,7 +78,7 @@ mm_bearer_list_get_count_active (MMBearerList *self)
 
 gboolean
 mm_bearer_list_add_bearer (MMBearerList *self,
-                           MMBearer *bearer,
+                           MMBaseBearer *bearer,
                            GError **error)
 {
     /* Just in case, ensure we don't go off limits */
@@ -115,7 +115,7 @@ mm_bearer_list_delete_bearer (MMBearerList *self,
     }
 
     for (l = self->priv->bearers; l; l = g_list_next (l)) {
-        if (g_str_equal (path, mm_bearer_get_path (MM_BEARER (l->data)))) {
+        if (g_str_equal (path, mm_base_bearer_get_path (MM_BASE_BEARER (l->data)))) {
             g_object_unref (l->data);
             self->priv->bearers = g_list_delete_link (self->priv->bearers, l);
             g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_NUM_BEARERS]);
@@ -153,7 +153,7 @@ mm_bearer_list_get_paths (MMBearerList *self)
                         1 + g_list_length (self->priv->bearers));
 
     for (i = 0, l = self->priv->bearers; l; l = g_list_next (l))
-        path_list[i++] = g_strdup (mm_bearer_get_path (MM_BEARER (l->data)));
+        path_list[i++] = g_strdup (mm_base_bearer_get_path (MM_BASE_BEARER (l->data)));
 
     return path_list;
 }
@@ -166,14 +166,14 @@ mm_bearer_list_foreach (MMBearerList *self,
     g_list_foreach (self->priv->bearers, (GFunc)func, user_data);
 }
 
-MMBearer *
+MMBaseBearer *
 mm_bearer_list_find (MMBearerList *self,
                      MMBearerProperties *properties)
 {
     GList *l;
 
     for (l = self->priv->bearers; l; l = g_list_next (l)) {
-        if (mm_bearer_properties_cmp (mm_bearer_peek_config (MM_BEARER (l->data)), properties))
+        if (mm_bearer_properties_cmp (mm_base_bearer_peek_config (MM_BASE_BEARER (l->data)), properties))
             return g_object_ref (l->data);
     }
 
@@ -185,7 +185,7 @@ mm_bearer_list_find (MMBearerList *self,
 typedef struct {
     GSimpleAsyncResult *result;
     GList *pending;
-    MMBearer *current;
+    MMBaseBearer *current;
 } DisconnectAllContext;
 
 static void
@@ -210,13 +210,13 @@ mm_bearer_list_disconnect_all_bearers_finish (MMBearerList *self,
 static void disconnect_next_bearer (DisconnectAllContext *ctx);
 
 static void
-disconnect_ready (MMBearer *bearer,
+disconnect_ready (MMBaseBearer *bearer,
                   GAsyncResult *res,
                   DisconnectAllContext *ctx)
 {
     GError *error = NULL;
 
-    if (!mm_bearer_disconnect_finish (bearer, res, &error)) {
+    if (!mm_base_bearer_disconnect_finish (bearer, res, &error)) {
         g_simple_async_result_take_error (ctx->result, error);
         disconnect_all_context_complete_and_free (ctx);
         return;
@@ -238,12 +238,12 @@ disconnect_next_bearer (DisconnectAllContext *ctx)
         return;
     }
 
-    ctx->current = MM_BEARER (ctx->pending->data);
+    ctx->current = MM_BASE_BEARER (ctx->pending->data);
     ctx->pending = g_list_delete_link (ctx->pending, ctx->pending);
 
-    mm_bearer_disconnect (ctx->current,
-                          (GAsyncReadyCallback)disconnect_ready,
-                          ctx);
+    mm_base_bearer_disconnect (ctx->current,
+                               (GAsyncReadyCallback)disconnect_ready,
+                               ctx);
 }
 
 void