diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-03-18 08:59:45 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2010-04-27 18:01:03 -0400 |
| commit | f615959724ef9eb2e445ab11e65aa368d08be822 (patch) | |
| tree | 0183f44e11820af2d8c45033dda1dfa346c49105 | |
| parent | 19210562f5845caa2e54db45bece8d018d768427 (diff) | |
| download | gdm-accounts-service-split.tar.gz | |
Don't crash when adding multiple user switchersaccounts-service-split
Before we were blowing an assertion because settings client was
getting initialized twice.
| -rw-r--r-- | gui/user-switch-applet/applet.c | 11 |
1 files 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")); |