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



commit 9166afdb4a6dfa4c7659dab75f009f9516bb6315
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri Oct 17 17:09:21 2014 +0200

    power: Call stop from finalize

 plugins/power/gsd-power-manager.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 069ddaf..e565d28 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1778,6 +1778,8 @@ gsd_power_manager_finalize (GObject *object)
 
         g_return_if_fail (manager->priv != NULL);
 
+        gsd_power_manager_stop (manager);
+
         g_clear_object (&manager->priv->connection);
 
         if (manager->priv->name_id != 0)
@@ -2421,7 +2423,8 @@ gsd_power_manager_stop (GsdPowerManager *manager)
                 manager->priv->introspection_data = NULL;
         }
 
-        g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
+        if (manager->priv->up_client)
+                g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
 
         g_clear_object (&manager->priv->session);
         g_clear_object (&manager->priv->settings);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]