Merge lp:~alan-griffiths/compiz-compizconfig-gconf/Bug-953214-revised into lp:compiz-compizconfig-gconf

Proposed by Alan Griffiths
Status: Merged
Approved by: Mikkel Kamstrup Erlandsen
Approved revision: 162
Merged at revision: 162
Proposed branch: lp:~alan-griffiths/compiz-compizconfig-gconf/Bug-953214-revised
Merge into: lp:compiz-compizconfig-gconf
Diff against target: 26 lines (+0/-10)
1 file modified
src/gconf.c (+0/-10)
To merge this branch: bzr merge lp:~alan-griffiths/compiz-compizconfig-gconf/Bug-953214-revised
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+98206@code.launchpad.net

Description of the change

g_main_loop_is_running(NULL) is always false, so code can be simplified.

The main loop should have exited anyway, as finiBackend() is invoked as part of shutdown logic.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Exactly :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gconf.c'
2--- src/gconf.c 2012-03-15 15:49:41 +0000
3+++ src/gconf.c 2012-03-19 14:38:27 +0000
4@@ -1958,12 +1958,6 @@
5 static Bool
6 finiBackend (CCSContext * context)
7 {
8-
9- if (g_main_loop_is_running(NULL))
10- {
11- processEvents (0);
12- }
13-
14 gconf_client_clear_cache (client);
15 finiClient ();
16
17@@ -1976,10 +1970,6 @@
18 gconf_engine_unref (conf);
19 conf = NULL;
20
21- if (g_main_loop_is_running(NULL))
22- {
23- processEvents (0);
24- }
25 return TRUE;
26 }
27

Subscribers

People subscribed via source and target branches