From f615959724ef9eb2e445ab11e65aa368d08be822 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 18 Mar 2010 08:59:45 -0400 Subject: Don't crash when adding multiple user switchers Before we were blowing an assertion because settings client was getting initialized twice. --- gui/user-switch-applet/applet.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c index 436207de..3b208841 100644 --- a/gui/user-switch-applet/applet.c +++ b/gui/user-switch-applet/applet.c @@ -1409,17 +1409,18 @@ fill_applet (PanelApplet *applet) "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); gtk_window_set_default_icon_name ("stock_people"); g_set_application_name (_("User Switch Applet")); + + if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) { + g_critical ("Unable to initialize settings client"); + exit (1); + } + } adata = g_new0 (GdmAppletData, 1); adata->applet = applet; adata->panel_size = 24; - if (! gdm_settings_client_init (GDMCONFDIR "/gdm.schemas", "/")) { - g_critical ("Unable to initialize settings client"); - exit (1); - } - adata->client = gconf_client_get_default (); gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status")); -- cgit v1.2.1