Compiz Core

Merge lp:~compiz-team/compiz-core/compiz-core.fix_886978 into lp:compiz-core/0.9.5

  1. compiz-core.fix_886978
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 2892
Proposed branch: lp:~compiz-team/compiz-core/compiz-core.fix_886978
Merge into: lp:compiz-core/0.9.5
Diff against target: 21 lines (+10/-2)
1 file modified
src/window.cpp (+10/-2)
To merge this branch: bzr merge lp:~compiz-team/compiz-core/compiz-core.fix_886978
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+81425@code.launchpad.net

Description of the change

Fix bug 886978

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

You are going to need to start thinking how to put this type of code into unit tests.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/window.cpp'
2--- src/window.cpp 2011-10-26 23:18:47 +0000
3+++ src/window.cpp 2011-11-07 02:35:26 +0000
4@@ -2026,8 +2026,16 @@
5 if (priv->geometry.border () != ce->border_width)
6 valueMask |= CWBorderWidth;
7
8- if (ROOTPARENT (window->prev) != ce->above)
9- valueMask |= CWSibling | CWStackMode;
10+ if (window->prev)
11+ {
12+ if (ROOTPARENT (window->prev) != ce->above)
13+ valueMask |= CWSibling | CWStackMode;
14+ }
15+ else
16+ {
17+ if (ce->above != 0)
18+ valueMask |= CWSibling | CWStackMode;
19+ }
20
21 priv->attrib.override_redirect = ce->override_redirect;
22

Subscribers

People subscribed via source and target branches