[Xfce4-commits] <xfce4-settings:nick/xsettingsd-merge> Release xsettings asap.

[Nick Schermer]

Updating branch refs/heads/nick/xsettingsd-merge
         to 9a0a3340b625f7cd061b3f71b3383044a24b7749 (commit)
       from 82d3de1bd0ecf15dc112d6bd81bd1567943425c5 (commit)

commit 9a0a3340b625f7cd061b3f71b3383044a24b7749
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Feb 23 21:58:52 2011 +0100

    Release xsettings asap.

 xfsettingsd/main.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index fb5a2f3..8a1f5cd 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -242,6 +242,7 @@ main (gint argc, gchar **argv)
         dbus_bus_release_name (dbus_connection, XFSETTINGS_DBUS_NAME, NULL);
 
     /* release the sub daemons */
+    g_object_unref (G_OBJECT (xsettings_helper));
 #ifdef HAVE_XRANDR
     g_object_unref (G_OBJECT (displays_helper));
 #endif
@@ -251,7 +252,6 @@ main (gint argc, gchar **argv)
     g_object_unref (G_OBJECT (shortcuts_helper));
     g_object_unref (G_OBJECT (keyboard_layout_helper));
     g_object_unref (G_OBJECT (workspaces_helper));
-    g_object_unref (G_OBJECT (xsettings_helper));
 
     if (G_LIKELY (clipboard_daemon != NULL))
     {
@@ -260,6 +260,7 @@ main (gint argc, gchar **argv)
     }
 
     xfconf_shutdown ();
+
     g_object_unref (G_OBJECT (sm_client));
 
     return EXIT_SUCCESS;