From cfeebcd63a392eb27a44095efa83b3d487ee5f6d Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Fri, 30 Mar 2012 16:18:48 +0200
Subject: manager: no need to remove modems in idle

There is no problem in getting the modem removed just after finishing the
disabling sequence.
---
 src/mm-manager.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/mm-manager.c b/src/mm-manager.c
index 9f05e43f..7000f038 100644
--- a/src/mm-manager.c
+++ b/src/mm-manager.c
@@ -671,36 +671,14 @@ mm_manager_start (MMManager *manager)
     mm_dbg ("Finished device scan...");
 }
 
-typedef struct {
-    MMManager *manager;
-    MMBaseModem *modem;
-} RemoveInfo;
-
-static gboolean
-remove_disable_one (RemoveInfo *info)
-{
-    remove_modem (info->manager, info->modem);
-    g_free (info);
-    return FALSE;
-}
-
 static void
 remove_disable_ready (MMBaseModem *modem,
                       GAsyncResult *res,
                       MMManager *self)
 {
-    RemoveInfo *info;
-
     /* We don't care about errors disabling at this point */
     mm_base_modem_disable_finish (modem, res, NULL);
-
-    /* Schedule modem removal from an idle handler since we get here deep
-     * in the modem removal callchain and can't remove it quite yet from here.
-     */
-    info = g_malloc0 (sizeof (RemoveInfo));
-    info->manager = self;
-    info->modem = modem;
-    g_idle_add ((GSourceFunc)remove_disable_one, info);
+    remove_modem (self, modem);
 }
 
 static void
-- 
cgit v1.2.3-70-g09d2