Merge lp:~larsu/unity-settings-daemon/lp1436861 into lp:unity-settings-daemon

[Lars Karlitski]

power: disconnect from device's "notify" signals

power: disconnect from device's "notify" signals

[lp:~larsu/unity-settings-daemon/lp1436861]

4110. By Lars Karlitski on 2015-10-21

power: disconnect from device's "notify" signals

[Sebastien Bacher (seb128)]

that makes sense and seems to work!

review: Approve

=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2015-09-16 21:06:41 +0000
+++ plugins/power/gsd-power-manager.c	2015-10-21 10:49:10 +0000
@@ -3430,6 +3430,9 @@
 void
 gsd_power_manager_stop (GsdPowerManager *manager)
 {
+        GPtrArray *devices;
+        int i;
+
         g_debug ("Stopping power manager");
 
         if (manager->priv->inhibit_lid_switch_timer_id != 0) {
@@ -3481,8 +3484,12 @@
         g_clear_object (&manager->priv->logind_proxy);
         g_clear_object (&manager->priv->rr_screen);
 
-        g_ptr_array_unref (manager->priv->devices_array);
+        devices = manager->priv->devices_array;
+        for (i = 0; i < devices->len; i++)
+                g_signal_handlers_disconnect_by_data (g_ptr_array_index (devices, i), manager);
+        g_ptr_array_unref (devices);
         manager->priv->devices_array = NULL;
+
         g_clear_object (&manager->priv->device_composite);
         g_clear_object (&manager->priv->previous_icon);