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

[Sam Spilsbury]

== 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

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

Should also fix bug 932125?

=== modified file 'plugin/ccp/src/ccp.cpp'
--- plugin/ccp/src/ccp.cpp	2011-08-20 19:03:37 +0000
+++ plugin/ccp/src/ccp.cpp	2012-03-26 13:04:17 +0000
@@ -422,10 +422,7 @@
 bool
 CcpScreen::timeout ()
 {
-    unsigned int flags = 0;
-
-    if (CompPlugin::find ("glib"))
-	flags |= ProcessEventsNoGlibMainLoopMask;
+    unsigned int flags = ProcessEventsNoGlibMainLoopMask;
 
     ccsProcessEvents (mContext, flags);