[gnome-settings-daemon] mouse: Simplify finalize() call

[Bastien Nocera <hadess src gnome org>]

commit 7c268ddf2c0fea89ed053e55002fba65c523904a
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 15 14:56:10 2013 +0100

    mouse: Simplify finalize() call

 plugins/mouse/gsd-mouse-manager.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 31044d2..ff99d4e 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -1329,26 +1329,11 @@ gsd_mouse_manager_finalize (GObject *object)
 
         g_return_if_fail (mouse_manager->priv != NULL);
 
+        gsd_mouse_manager_stop (mouse_manager);
+
         if (mouse_manager->priv->blacklist != NULL)
                 g_hash_table_destroy (mouse_manager->priv->blacklist);
 
-        if (mouse_manager->priv->start_idle_id != 0)
-                g_source_remove (mouse_manager->priv->start_idle_id);
-
-        if (mouse_manager->priv->device_manager != NULL) {
-                g_signal_handler_disconnect (mouse_manager->priv->device_manager, mouse_manager->priv->device_added_id);
-                g_signal_handler_disconnect (mouse_manager->priv->device_manager, mouse_manager->priv->device_removed_id);
-        }
-
-        if (mouse_manager->priv->mouse_settings != NULL)
-                g_object_unref (mouse_manager->priv->mouse_settings);
-
-        if (mouse_manager->priv->mouse_a11y_settings != NULL)
-                g_object_unref (mouse_manager->priv->mouse_a11y_settings);
-
-        if (mouse_manager->priv->touchpad_settings != NULL)
-                g_object_unref (mouse_manager->priv->touchpad_settings);
-
         G_OBJECT_CLASS (gsd_mouse_manager_parent_class)->finalize (object);
 }