Merge lp:~robert-ancell/lightdm/remove-more-sources into lp:lightdm

[Robert Ancell]

More carefully remove GSources

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1910
http://jenkins.qa.ubuntu.com/job/lightdm-ci/249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/43

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/249/rebuild

review: Approve (continuous-integration)

=== modified file 'src/process.c'
--- src/process.c	2014-02-25 22:12:22 +0000
+++ src/process.c	2014-03-04 04:30:35 +0000
@@ -149,6 +149,7 @@
 {
     Process *process = data;
 
+    process->priv->watch = 0;
     process->priv->exit_status = status;
 
     if (WIFEXITED (status))
@@ -156,10 +157,6 @@
     else if (WIFSIGNALED (status))
         g_debug ("Process %d terminated with signal %d", pid, WTERMSIG (status));
 
-    if (process->priv->watch)
-        g_source_remove (process->priv->watch);
-    process->priv->watch = 0;
-
     if (process->priv->quit_timeout)
         g_source_remove (process->priv->quit_timeout);
     process->priv->quit_timeout = 0;  
 
=== modified file 'src/unity-system-compositor.c'
--- src/unity-system-compositor.c	2014-02-25 22:12:22 +0000
+++ src/unity-system-compositor.c	2014-03-04 04:30:35 +0000
@@ -472,7 +472,7 @@
     if (self->priv->from_compositor_watch)      
         g_source_remove (self->priv->from_compositor_watch);
     g_free (self->priv->read_buffer);
-    if (self->priv->timeout_source != 0)
+    if (self->priv->timeout_source)
         g_source_remove (self->priv->timeout_source);
 
     G_OBJECT_CLASS (unity_system_compositor_parent_class)->finalize (object);
 
=== modified file 'src/xdmcp-server.c'
--- src/xdmcp-server.c	2013-07-24 03:02:30 +0000
+++ src/xdmcp-server.c	2014-03-04 04:30:35 +0000
@@ -116,6 +116,8 @@
 static gboolean
 session_timeout_cb (XDMCPSession *session)
 {
+    session->priv->inactive_timeout = 0;
+
     g_debug ("Timing out unmanaged session %d", session->priv->id);
     g_hash_table_remove (session->priv->server->priv->sessions, GINT_TO_POINTER ((gint) session->priv->id));
     return FALSE;
@@ -516,7 +518,8 @@
     if (result)
     {
         /* Cancel the inactive timer */
-        g_source_remove (session->priv->inactive_timeout);
+        if (session->priv->inactive_timeout)
+            g_source_remove (session->priv->inactive_timeout);
 
         session->priv->started = TRUE;
     }