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

[gerdk svn gnome org]

Author: gerdk
Date: Sun Mar 30 19:10:22 2008
New Revision: 249
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=249&view=rev

Log:
2008-03-30  Gerd Kohlberger <gerdk svn gnome org>

	* plugins/mouse/gsd-mouse-manager.c:
	(set_mousetweaks_daemon): Set gconf keys back to false,
	if mousetweaks isn't installed. Bug #525042.



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	Sun Mar 30 19:10:22 2008
@@ -558,6 +558,7 @@
                 if (error->code == G_SPAWN_ERROR_NOENT &&
                     (dwell_enable || delay_enable)) {
                         GtkWidget *dialog;
+                        GConfClient *client;
 
                         dialog = gtk_message_dialog_new (NULL, 0,
                                                          GTK_MESSAGE_WARNING,
@@ -572,6 +573,17 @@
                                                   "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);
         }