[Xfce4-commits] <xfce4-settings:master> Do not start the daemon using an idle function.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 60bb3e5b9eb9446f5848ab7d2900d6455efe2369 (commit)
       from ffa77c36f69a560feaae504ae029b81d25dc419a (commit)

commit 60bb3e5b9eb9446f5848ab7d2900d6455efe2369
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Nov 18 09:56:52 2009 +0100

    Do not start the daemon using an idle function.

 xfce4-settings-helper/xfce-clipboard-manager.c |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/xfce4-settings-helper/xfce-clipboard-manager.c b/xfce4-settings-helper/xfce-clipboard-manager.c
index a32eb06..5fdbac3 100644
--- a/xfce4-settings-helper/xfce-clipboard-manager.c
+++ b/xfce4-settings-helper/xfce-clipboard-manager.c
@@ -250,8 +250,8 @@ primary_clipboard_owner_change (XfceClipboardManager *manager,
     }
 }
 
-static gboolean
-start_clipboard_idle_cb (XfceClipboardManager *manager)
+gboolean
+xfce_clipboard_manager_start (XfceClipboardManager *manager)
 {
   XClientMessageEvent     xev;
   gboolean                ownership;
@@ -259,13 +259,15 @@ start_clipboard_idle_cb (XfceClipboardManager *manager)
   Window                  window;
   Time                    timestamp;
 
+  g_return_val_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager), FALSE);
+
   display = GDK_DISPLAY ();
   init_atoms (display);
 
   /* Check if there is a clipboard manager running */
   if (gdk_display_supports_clipboard_persistence (gdk_display_get_default ()))
     {
-      g_warning ("Clipboard manager is already running.");
+      g_warning ("A clipboard manager is already running.");
       return FALSE;
     }
 
@@ -304,18 +306,9 @@ start_clipboard_idle_cb (XfceClipboardManager *manager)
   else
     {
       xfce_clipboard_manager_stop (manager);
+      return FALSE;
     }
 
-  return FALSE;
-}
-
-gboolean
-xfce_clipboard_manager_start (XfceClipboardManager *manager)
-{
-  g_return_if_fail (XFCE_IS_CLIPBOARD_MANAGER (manager));
-
-  g_idle_add ((GSourceFunc) start_clipboard_idle_cb, manager);
-
   return TRUE;
 }