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

[Lars Karlitski]

Idle monitor: fix ref counting bugs

Idle monitor: fix ref counting bugs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4061
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/55/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Looks good to me, thank you

review: Approve

=== modified file 'gnome-settings-daemon/gsd-idle-monitor.c'
--- gnome-settings-daemon/gsd-idle-monitor.c	2014-10-10 05:53:44 +0000
+++ gnome-settings-daemon/gsd-idle-monitor.c	2014-10-14 14:37:29 +0000
@@ -321,10 +321,10 @@
   g_slice_free (GsdIdleMonitorWatch, watch);
 }
 
-GdkFilterReturn
+static GdkFilterReturn
 xevent_filter (GdkXEvent *xevent,
-               GdkEvent *event,
-               GsdIdleMonitor *monitor)
+               GdkEvent  *event,
+               gpointer   user_data)
 {
   XEvent *ev;
 
@@ -366,7 +366,9 @@
       monitor->user_active_alarm = None;
     }
 
-  device_monitors[monitor->device_id] = NULL;  
+  /* The device in device_monitors is cleared when the device is
+   * removed. Ensure that the object is not deleted before that. */
+  g_assert_null (device_monitors[monitor->device_id]);
 
   G_OBJECT_CLASS (gsd_idle_monitor_parent_class)->dispose (object);
 }
@@ -828,7 +830,6 @@
   int device_id;
   char *path;
 
-  g_object_ref(device);
   device_id = gdk_x11_device_get_id (device);
   monitor = gsd_idle_monitor_get_for_device (device_id);
   g_object_ref(monitor);
@@ -851,7 +852,6 @@
   g_dbus_object_manager_server_unexport (manager, path);
   g_free (path);
 
-  g_object_unref(device_monitors[device_id]);
   g_clear_object (&device_monitors[device_id]);
   if (device_id == device_id_max)
     device_id_max--;
@@ -896,7 +896,7 @@
 
   g_dbus_object_manager_server_set_connection (manager, connection);
 
-  gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, monitor);
+  gdk_window_add_filter (NULL, xevent_filter, NULL);
 }
 
 static void
@@ -912,10 +912,9 @@
               const char      *name,
               gpointer         user_data)
 {
-  g_debug ("Lost or failed to acquire name %s\n", name);
+  g_warning ("Lost or failed to acquire name %s\n", name);
 
-  gdk_window_remove_filter (NULL, (GdkFilterFunc)xevent_filter, NULL);
-  //mainloop_quit();
+  gdk_window_remove_filter (NULL, xevent_filter, NULL);
 }
 
 static void

=== modified file 'plugins/cursor/gsd-cursor-manager.c'
--- plugins/cursor/gsd-cursor-manager.c	2014-10-07 03:17:00 +0000
+++ plugins/cursor/gsd-cursor-manager.c	2014-10-14 14:37:29 +0000
@@ -147,8 +147,6 @@
         /* Make sure that all the other devices are watched
          * (but not the one we just stopped monitoring */
         add_all_devices (manager, device, NULL);
-
-        g_object_unref (device);
 }
 
 static gboolean
@@ -179,7 +177,7 @@
         }
         g_hash_table_insert (manager->priv->monitors,
                              device,
-                             monitor);
+                             g_object_ref (monitor));
         gsd_idle_monitor_add_user_active_watch (monitor,
                                                 monitor_became_active,
                                                 manager,

=== modified file 'plugins/power/gsd-power-manager.c'
--- plugins/power/gsd-power-manager.c	2014-10-07 01:23:52 +0000
+++ plugins/power/gsd-power-manager.c	2014-10-14 14:37:29 +0000
@@ -3548,7 +3548,7 @@
                                                                   "use-time-for-policy");
 
         /* create IDLETIME watcher */
-        manager->priv->idle_monitor = gsd_idle_monitor_get_core ();
+        manager->priv->idle_monitor = g_object_ref (gsd_idle_monitor_get_core ());
 
         /* set up the screens */
         g_signal_connect (manager->priv->rr_screen, "changed", G_CALLBACK (on_randr_event), manager);