[network-manager-applet] applet: initialize nm-client before the widgets



commit 4d88c806cac989ee02e035689be73130fdd558cb
Author: Pavel Šimerda <psimerda redhat com>
Date:   Thu Jan 15 12:13:04 2015 +0100

    applet: initialize nm-client before the widgets
    
    With appindicator patches, when built with --enable-indicator,
    setup_widgets has to build the whole menu and thus requires access to
    NetworkManager data. The patch doesn't cause any harm in non-indicator
    mode.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=740574

 src/applet.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/src/applet.c b/src/applet.c
index 39ea8e4..c2fac9b 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -3569,6 +3569,7 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
        g_signal_connect (applet->gsettings, "changed::show-applet",
                          G_CALLBACK (applet_gsettings_show_changed), applet);
 
+       foo_client_setup (applet);
 
        /* Load pixmaps and create applet widgets */
        if (!setup_widgets (applet)) {
@@ -3648,8 +3649,6 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
        applet->infiniband_class = applet_device_infiniband_get_class (applet);
        g_assert (applet->infiniband_class);
 
-       foo_client_setup (applet);
-
 #if WITH_MODEM_MANAGER_1
        mm1_client_setup (applet);
 #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]