Compiz

Merge lp:~vanvugt/compiz/fix-1036490 into lp:compiz/0.9.8

  1. fix-1036490
  2. Merge into 0.9.8
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3308
Merged at revision: 3308
Proposed branch: lp:~vanvugt/compiz/fix-1036490
Merge into: lp:compiz/0.9.8
Diff against target: 16 lines (+1/-6)
1 file modified
plugins/ccp/src/ccp.cpp (+1/-6)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1036490
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+119660@code.launchpad.net

Commit message

Restore the fix for avoiding re-entering the glib event loop and crashing.
(LP: #1036490) (regression of LP: #970488)

It seems the fix got lost when we merged the compizconfig projects into trunk.

Description of the change

Restore the fix for avoiding re-entering the glib event loop and crashing.
(LP: #1036490) (regression of LP: #970488)

It seems the fix got lost when we merged the compizconfig projects into trunk.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches