[gdm] Don't crash when adding multiple user switchers
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] Don't crash when adding multiple user switchers
- Date: Fri, 11 Jun 2010 00:19:15 +0000 (UTC)
commit 8a787d1fb1bfbcc076605cc97566ef06b0f663f0
Author: Ray Strode <rstrode redhat com>
Date: Thu Mar 18 08:59:45 2010 -0400
Don't crash when adding multiple user switchers
Before we were blowing an assertion because settings client was
getting initialized twice.
https://bugzilla.gnome.org/show_bug.cgi?id=610179
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 411a129..8b419f2 100644
--- a/gui/user-switch-applet/applet.c
+++ b/gui/user-switch-applet/applet.c
@@ -1410,17 +1410,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"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]