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

[behdad svn gnome org]

Author: behdad
Date: Mon Nov  3 21:30:41 2008
New Revision: 579
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=579&view=rev

Log:
2008-11-03  Behdad Esfahbod  <behdad gnome org>

        * plugins/mouse/gsd-mouse-manager.c (set_mousetweaks_daemon):
        Don't run "mousetweaks -s" at startup time (#559165)

        All "mousetweaks -s" does is shutdown the already-running daemon.
        When g-s-d starts, there is no daemon running.  So, remember that and
        do not try to shut the non-existing daemon down.

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	Mon Nov  3 21:30:41 2008
@@ -66,6 +66,8 @@
 {
         guint notify;
         guint notify_a11y;
+
+        gboolean mousetweaks_daemon_running;
 };
 
 static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
@@ -579,9 +581,17 @@
 {
         GError *error = NULL;
         gchar *comm;
+        gboolean run_daemon = dwell_enable || delay_enable;
+
+        if (run_daemon || manager->priv->mousetweaks_daemon_running)
+                comm = g_strdup_printf ("mousetweaks %s",
+                                        run_daemon ? "" : "-s");
+        else
+                return;
+
+        if (run_daemon)
+                manager->priv->mousetweaks_daemon_running = TRUE;
 
-        comm = g_strdup_printf ("mousetweaks %s",
-                                (dwell_enable || delay_enable) ? "" : "-s");
 
         if (! g_spawn_command_line_async (comm, &error)) {
                 if (error->code == G_SPAWN_ERROR_NOENT &&