[gnome-settings-daemon] xsettings: Call stop from finalize

[Rui Matos <rtcm src gnome org>]

commit 5ce9d339a3f4edb6894f58cbf42d0618a01d7706
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri Oct 17 17:10:36 2014 +0200

    xsettings: Call stop from finalize

 plugins/xsettings/gsd-xsettings-manager.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index e308269..4d4698d 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -1266,8 +1266,10 @@ gnome_xsettings_manager_stop (GnomeXSettingsManager *manager)
                 g_clear_object (&manager->priv->rr_screen);
         }
 
-        if (p->shell_name_watch_id > 0)
+        if (p->shell_name_watch_id > 0) {
                 g_bus_unwatch_name (p->shell_name_watch_id);
+                p->shell_name_watch_id = 0;
+        }
 
         if (p->manager != NULL) {
                 xsettings_manager_destroy (p->manager);
@@ -1320,6 +1322,8 @@ gnome_xsettings_manager_finalize (GObject *object)
 
         g_return_if_fail (xsettings_manager->priv != NULL);
 
+        gnome_xsettings_manager_stop (xsettings_manager);
+
         if (xsettings_manager->priv->start_idle_id != 0)
                 g_source_remove (xsettings_manager->priv->start_idle_id);