Attachment 114962 Details for Bug 85305 – modem-manager: Wait for modem to be enabled

[patch] modem-manager: Wait for modem to be enabled

modem-manager-Wait-for-modem-to-be-enabled.patch (text/plain), 3.89 KB, created by Zeeshan Ali on 2015-04-08 15:13:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zeeshan Ali

Created: 2015-04-08 15:13:25 UTC

Size: 3.89 KB

patch

obsolete

>From 369669a94fc2ddf30947bfb74485db54705b2256 Mon Sep 17 00:00:00 2001
>From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
>Date: Wed, 1 Apr 2015 20:22:20 +0100
>Subject: [PATCH] modem-manager: Wait for modem to be enabled
>
>Modem's location capabilities won't be known until its enabled.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=85305
>---
> src/gclue-modem-manager.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 57 insertions(+), 1 deletion(-)
>
>diff --git a/src/gclue-modem-manager.c b/src/gclue-modem-manager.c
>index b49d6d9..56c35f4 100644
>--- a/src/gclue-modem-manager.c
>+++ b/src/gclue-modem-manager.c
>@@ -506,16 +506,72 @@ modem_has_caps (GClueModemManager    *manager,
> static void
> on_mm_object_added (GDBusObjectManager *object_manager,
>                     GDBusObject        *object,
>+                    gpointer            user_data);
>+
>+static void
>+on_mm_modem_state_notify (GObject    *gobject,
>+                          GParamSpec *pspec,
>+                          gpointer    user_data)
>+{
>+        MMModem *mm_modem = MM_MODEM (gobject);
>+        GClueModemManager *manager = GCLUE_MODEM_MANAGER (user_data);
>+        GClueModemManagerPrivate *priv = manager->priv;
>+        GDBusObjectManager *obj_manager = G_DBUS_OBJECT_MANAGER (priv->manager);
>+        const char *path = mm_modem_get_path (mm_modem);
>+        GDBusObject *object;
>+
>+        if (priv->mm_object != NULL) {
>+                // In the meantime another modem with location caps was found.
>+                g_signal_handlers_disconnect_by_func (mm_modem,
>+                                                      on_mm_modem_state_notify,
>+                                                      user_data);
>+                g_object_unref (gobject);
>+
>+                return;
>+        }
>+
>+        if (mm_modem_get_state (mm_modem) < MM_MODEM_STATE_ENABLED)
>+                return;
>+
>+        g_debug ("Modem '%s' now enabled", path);
>+
>+        g_signal_handlers_disconnect_by_func (mm_modem,
>+                                              on_mm_modem_state_notify,
>+                                              user_data);
>+
>+        object = g_dbus_object_manager_get_object (obj_manager, path);
>+        on_mm_object_added (obj_manager, object, user_data);
>+        g_object_unref (mm_modem);
>+}
>+
>+static void
>+on_mm_object_added (GDBusObjectManager *object_manager,
>+                    GDBusObject        *object,
>                     gpointer            user_data)
> {
>         MMObject *mm_object = MM_OBJECT (object);
>         GClueModemManager *manager = GCLUE_MODEM_MANAGER (user_data);
>+        MMModem *mm_modem;
>         MMModemLocation *modem_location;
> 
>         if (manager->priv->mm_object != NULL)
>                 return;
> 
>         g_debug ("New modem '%s'", mm_object_get_path (mm_object));
>+        mm_modem = mm_object_get_modem (mm_object);
>+        if (mm_modem_get_state (mm_modem) < MM_MODEM_STATE_ENABLED) {
>+                g_debug ("Modem '%s' not enabled",
>+                         mm_object_get_path (mm_object));
>+
>+                g_signal_connect_object (mm_modem,
>+                                         "notify::state",
>+                                         G_CALLBACK (on_mm_modem_state_notify),
>+                                         manager,
>+                                         0);
>+
>+                return;
>+        }
>+
>         modem_location = mm_object_peek_modem_location (mm_object);
>         if (modem_location == NULL)
>                 return;
>@@ -524,7 +580,7 @@ on_mm_object_added (GDBusObjectManager *object_manager,
>                  mm_object_get_path (mm_object));
> 
>         manager->priv->mm_object = g_object_ref (mm_object);
>-        manager->priv->modem = mm_object_get_modem (mm_object);
>+        manager->priv->modem = mm_modem;
>         manager->priv->modem_location = mm_object_get_modem_location (mm_object);
> 
>         g_signal_connect (G_OBJECT (manager->priv->modem_location),
>-- 
>2.1.0

Actions: View | Splinter Review

Attachments on bug 85305: 114961 | 114962

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.