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
=== modified file 'src/gconf.c'
--- src/gconf.c 2012-03-15 15:49:41 +0000
+++ src/gconf.c 2012-03-19 14:38:27 +0000
@@ -1958,12 +1958,6 @@
1958static Bool1958static Bool
1959finiBackend (CCSContext * context)1959finiBackend (CCSContext * context)
1960{1960{
1961
1962 if (g_main_loop_is_running(NULL))
1963 {
1964 processEvents (0);
1965 }
1966
1967 gconf_client_clear_cache (client);1961 gconf_client_clear_cache (client);
1968 finiClient ();1962 finiClient ();
19691963
@@ -1976,10 +1970,6 @@
1976 gconf_engine_unref (conf);1970 gconf_engine_unref (conf);
1977 conf = NULL;1971 conf = NULL;
19781972
1979 if (g_main_loop_is_running(NULL))
1980 {
1981 processEvents (0);
1982 }
1983 return TRUE;1973 return TRUE;
1984}1974}
19851975

Subscribers

People subscribed via source and target branches