1
=== modified file 'src/process.c'
2
--- src/process.c	2013-09-05 08:11:23 +0000
3
+++ src/process.c	2013-10-09 23:35:19 +0000
4
@@ -297,6 +297,8 @@
5
297
297
6
298
    g_free (self->priv->command);
298
    g_free (self->priv->command);
7
299
    g_hash_table_unref (self->priv->env);
299
    g_hash_table_unref (self->priv->env);
8
300
    if (self->priv->quit_timeout)
9
301
        g_source_remove (self->priv->quit_timeout);
10
300
    if (self->priv->watch)
302
    if (self->priv->watch)
11
301
        g_source_remove (self->priv->watch);
303
        g_source_remove (self->priv->watch);
12
302
304
Status:	Merged
Approved by:	Robert Ancell on 2013-10-09
Approved revision:	1813
Merged at revision:	1813
Proposed branch:	lp:~robert-ancell/lightdm/process-quit-timeout
Merge into:	lp:lightdm
Diff against target:	11 lines (+2/-0) 1 file modified src/process.c (+2/-0)
To merge this branch:	bzr merge lp:~robert-ancell/lightdm/process-quit-timeout
Related bugs:	Link a bug report
Reviewer	Review Type	Status
PS Jenkins bot	continuous-integration	Approve on 2013-10-09
Robert Ancell		Approve on 2013-10-09
Review via email: mp+190267@code.launchpad.net
1	=== modified file 'src/process.c'
2	--- src/process.c 2013-09-05 08:11:23 +0000
3	+++ src/process.c 2013-10-09 23:35:19 +0000
4	@@ -297,6 +297,8 @@
5	297		297
6	298	g_free (self->priv->command);	298	g_free (self->priv->command);
7	299	g_hash_table_unref (self->priv->env);	299	g_hash_table_unref (self->priv->env);
8			300	if (self->priv->quit_timeout)
9			301	g_source_remove (self->priv->quit_timeout);
10	300	if (self->priv->watch)	302	if (self->priv->watch)
11	301	g_source_remove (self->priv->watch);	303	g_source_remove (self->priv->watch);
12	302		304