gnome-settings-daemon r308 - in trunk: . plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Fri Apr 18 19:06:32 2008
New Revision: 308
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=308&view=rev

Log:
2008-04-18  Jens Granseuer  <jensgr gmx net>

	* plugins/mouse/gsd-mouse-manager.c: (set_mousetweaks_daemon): when we
	can't launch the daemon reset the GConf keys before showing the error
	dialog. If we wait until after the dialog is closed, the user can
	still toggle the settings while it's open


Modified:
   trunk/ChangeLog
   trunk/plugins/mouse/gsd-mouse-manager.c

Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c	(original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c	Fri Apr 18 19:06:32 2008
@@ -554,6 +554,17 @@
                         GtkWidget *dialog;
                         GConfClient *client;
 
+                        client = gconf_client_get_default ();
+                        if (dwell_enable)
+                                gconf_client_set_bool (client,
+                                                       KEY_DWELL_ENABLE,
+                                                       FALSE, NULL);
+                        else if (delay_enable)
+                                gconf_client_set_bool (client,
+                                                       KEY_DELAY_ENABLE,
+                                                       FALSE, NULL);
+                        g_object_unref (client);
+
                         dialog = gtk_message_dialog_new (NULL, 0,
                                                          GTK_MESSAGE_WARNING,
                                                          GTK_BUTTONS_OK,
@@ -567,17 +578,6 @@
                                                   "gnome-dev-mouse-optical");
                         gtk_dialog_run (GTK_DIALOG (dialog));
                         gtk_widget_destroy (dialog);
-
-                        client = gconf_client_get_default ();
-                        if (dwell_enable)
-                                gconf_client_set_bool (client,
-                                                       KEY_DWELL_ENABLE,
-                                                       FALSE, NULL);
-                        else if (delay_enable)
-                                gconf_client_set_bool (client,
-                                                       KEY_DELAY_ENABLE,
-                                                       FALSE, NULL);
-                        g_object_unref (client);
                 }
                 g_error_free (error);
         }