Compiz Core

Merge lp:~smspillaz/compiz-core/compiz-core.fix_kwd_build_region_types into lp:compiz-core/0.9.5

  1. compiz-core.fix_kwd_build_region_types
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 2903
Proposed branch: lp:~smspillaz/compiz-core/compiz-core.fix_kwd_build_region_types
Merge into: lp:compiz-core/0.9.5
Diff against target: 17 lines (+4/-4)
1 file modified
kde/window-decorator-kde4/window.cpp (+4/-4)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/compiz-core.fix_kwd_build_region_types
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+87941@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kde/window-decorator-kde4/window.cpp'
2--- kde/window-decorator-kde4/window.cpp 2011-09-03 07:56:45 +0000
3+++ kde/window-decorator-kde4/window.cpp 2012-01-09 14:54:24 +0000
4@@ -1043,10 +1043,10 @@
5 {
6 Atom atom = Atoms::compizWindowBlurDecor;
7 QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
8- Region topRegion = NULL;
9- Region bottomRegion = NULL;
10- Region leftRegion = NULL;
11- Region rightRegion = NULL;
12+ ::Region topRegion = NULL;
13+ ::Region bottomRegion = NULL;
14+ ::Region leftRegion = NULL;
15+ ::Region rightRegion = NULL;
16 int size = 0;
17 int w, h;
18

Subscribers

People subscribed via source and target branches