Light Display Manager

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

  1. remove-more-sources
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1910
Merged at revision: 1910
Proposed branch: lp:~robert-ancell/lightdm/remove-more-sources
Merge into: lp:lightdm
Diff against target: 58 lines (+6/-6)
3 files modified
src/process.c (+1/-4)
src/unity-system-compositor.c (+1/-1)
src/xdmcp-server.c (+4/-1)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/remove-more-sources
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+209167@code.launchpad.net

Commit message

More carefully remove GSources

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/process.c'
2--- src/process.c 2014-02-25 22:12:22 +0000
3+++ src/process.c 2014-03-04 04:30:35 +0000
4@@ -149,6 +149,7 @@
5 {
6 Process *process = data;
7
8+ process->priv->watch = 0;
9 process->priv->exit_status = status;
10
11 if (WIFEXITED (status))
12@@ -156,10 +157,6 @@
13 else if (WIFSIGNALED (status))
14 g_debug ("Process %d terminated with signal %d", pid, WTERMSIG (status));
15
16- if (process->priv->watch)
17- g_source_remove (process->priv->watch);
18- process->priv->watch = 0;
19-
20 if (process->priv->quit_timeout)
21 g_source_remove (process->priv->quit_timeout);
22 process->priv->quit_timeout = 0;
23
24=== modified file 'src/unity-system-compositor.c'
25--- src/unity-system-compositor.c 2014-02-25 22:12:22 +0000
26+++ src/unity-system-compositor.c 2014-03-04 04:30:35 +0000
27@@ -472,7 +472,7 @@
28 if (self->priv->from_compositor_watch)
29 g_source_remove (self->priv->from_compositor_watch);
30 g_free (self->priv->read_buffer);
31- if (self->priv->timeout_source != 0)
32+ if (self->priv->timeout_source)
33 g_source_remove (self->priv->timeout_source);
34
35 G_OBJECT_CLASS (unity_system_compositor_parent_class)->finalize (object);
36
37=== modified file 'src/xdmcp-server.c'
38--- src/xdmcp-server.c 2013-07-24 03:02:30 +0000
39+++ src/xdmcp-server.c 2014-03-04 04:30:35 +0000
40@@ -116,6 +116,8 @@
41 static gboolean
42 session_timeout_cb (XDMCPSession *session)
43 {
44+ session->priv->inactive_timeout = 0;
45+
46 g_debug ("Timing out unmanaged session %d", session->priv->id);
47 g_hash_table_remove (session->priv->server->priv->sessions, GINT_TO_POINTER ((gint) session->priv->id));
48 return FALSE;
49@@ -516,7 +518,8 @@
50 if (result)
51 {
52 /* Cancel the inactive timer */
53- g_source_remove (session->priv->inactive_timeout);
54+ if (session->priv->inactive_timeout)
55+ g_source_remove (session->priv->inactive_timeout);
56
57 session->priv->started = TRUE;
58 }

Subscribers

People subscribed via source and target branches