Merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_965220 into lp:compiz-libcompizconfig

Proposed by Sam Spilsbury on 2012-03-26
Status: Merged
Merged at revision: 430
Proposed branch: lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_965220
Merge into: lp:compiz-libcompizconfig
Diff against target: 14 lines (+1/-4)
1 file modified
plugin/ccp/src/ccp.cpp (+1/-4)
To merge this branch: bzr merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.fix_965220
Reviewer Review Type Date Requested Status
Daniel van Vugt 2012-03-26 Approve on 2012-03-26
Alan Griffiths Approve on 2012-03-26
Review via email: mp+99307@code.launchpad.net

Description of the change

== Problem ==

We don't ship the GLib main loop plugin anymore but we were still processing glib events inside of compizconfig

== Solution ==

Never process GLib events in compizconfig

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Daniel van Vugt (vanvugt) :
review: Approve
Daniel van Vugt (vanvugt) wrote :

Should also fix bug 932125?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/ccp/src/ccp.cpp'
2--- plugin/ccp/src/ccp.cpp 2011-08-20 19:03:37 +0000
3+++ plugin/ccp/src/ccp.cpp 2012-03-26 13:04:17 +0000
4@@ -422,10 +422,7 @@
5 bool
6 CcpScreen::timeout ()
7 {
8- unsigned int flags = 0;
9-
10- if (CompPlugin::find ("glib"))
11- flags |= ProcessEventsNoGlibMainLoopMask;
12+ unsigned int flags = ProcessEventsNoGlibMainLoopMask;
13
14 ccsProcessEvents (mContext, flags);
15

Subscribers

People subscribed via source and target branches