From af1f8ed6b35de3ac08263e8ee1de8783f54ffa20 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Fri, 20 Jan 2012 10:54:45 +0100
Subject: broadband-modem: disconnect all bearers when disabling

---
 src/mm-broadband-modem.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'src')

diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index fcecd8dc..7a6dde62 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -3972,6 +3972,7 @@ modem_location_load_capabilities (MMIfaceModemLocation *self,
 
 typedef enum {
     DISABLING_STEP_FIRST,
+    DISABLING_STEP_DISCONNECT_BEARERS,
     DISABLING_STEP_IFACE_SIMPLE,
     DISABLING_STEP_IFACE_MESSAGING,
     DISABLING_STEP_IFACE_LOCATION,
@@ -4046,6 +4047,24 @@ INTERFACE_DISABLE_READY_FN (iface_modem_3gpp,     MM_IFACE_MODEM_3GPP,     TRUE)
 INTERFACE_DISABLE_READY_FN (iface_modem_cdma,     MM_IFACE_MODEM_CDMA,     TRUE)
 INTERFACE_DISABLE_READY_FN (iface_modem_location, MM_IFACE_MODEM_LOCATION, FALSE)
 
+static void
+bearer_list_disconnect_all_bearers_ready (MMBearerList *list,
+                                          GAsyncResult *res,
+                                          DisablingContext *ctx)
+{
+    GError *error = NULL;
+
+    if (!mm_bearer_list_disconnect_all_bearers_finish (list, res, &error)) {
+        g_simple_async_result_take_error (G_SIMPLE_ASYNC_RESULT (ctx->result), error);
+        disabling_context_complete_and_free (ctx);
+        return;
+    }
+
+    /* Go on to next step */
+    ctx->step++;
+    disabling_step (ctx);
+}
+
 static void
 disabling_step (DisablingContext *ctx)
 {
@@ -4054,6 +4073,13 @@ disabling_step (DisablingContext *ctx)
         /* Fall down to next step */
         ctx->step++;
 
+    case DISABLING_STEP_DISCONNECT_BEARERS:
+        mm_bearer_list_disconnect_all_bearers (
+            ctx->self->priv->modem_bearer_list,
+            (GAsyncReadyCallback)bearer_list_disconnect_all_bearers_ready,
+            ctx);
+        return;
+
     case DISABLING_STEP_IFACE_SIMPLE:
         /* Fall down to next step */
         ctx->step++;
-- 
cgit v1.2.3-70-g09d2