[Xfce4-commits] <xfce4-settings:master> Stop clipboard daemon when mainloop exits.

[Nick Schermer]

Updating branch refs/heads/master
         to ccd105e1d2818edbecf1fef10ba81cc04324865e (commit)
       from 07c0dc20918829ce14ebb21841538aa64ca4b659 (commit)

commit ccd105e1d2818edbecf1fef10ba81cc04324865e
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Nov 17 19:21:03 2009 +0100

    Stop clipboard daemon when mainloop exits.

 xfce4-settings-helper/gsd-clipboard-manager.c |    1 -
 xfce4-settings-helper/main.c                  |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/xfce4-settings-helper/gsd-clipboard-manager.c b/xfce4-settings-helper/gsd-clipboard-manager.c
index e5c85a4..016e031 100644
--- a/xfce4-settings-helper/gsd-clipboard-manager.c
+++ b/xfce4-settings-helper/gsd-clipboard-manager.c
@@ -233,7 +233,6 @@ static gboolean
 start_clipboard_idle_cb (GsdClipboardManager *manager)
 {
         XClientMessageEvent     xev;
-        gboolean                ownership;
         Display                *display;
         Window                  window;
         Time                    timestamp;
diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c
index 8dc79b4..154a805 100644
--- a/xfce4-settings-helper/main.c
+++ b/xfce4-settings-helper/main.c
@@ -354,6 +354,9 @@ main (gint argc, gchar **argv)
 #endif
     g_object_unref (G_OBJECT (workspaces_helper));
 
+    /* stop clipboard daemon */
+    gsd_clipboard_manager_stop (clipboard_daemon);
+
     /* shutdown xfconf */
     xfconf_shutdown ();