Compiz Core

Merge lp:~smspillaz/compiz-core/fix-kwd-build-name into lp:compiz-core/0.9.5

  1. fix-kwd-build-name
  2. Merge into 0.9.5
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 2902
Proposed branch: lp:~smspillaz/compiz-core/fix-kwd-build-name
Merge into: lp:compiz-core/0.9.5
Diff against target: 121 lines (+25/-14)
4 files modified
CMakeLists.txt (+1/-0)
gtk/window-decorator/metacity.c (+14/-5)
kde/window-decorator-kde4/window.cpp (+4/-4)
src/timer/tests/callbacks/src/test-timer-callbacks.cpp (+6/-5)
To merge this branch: bzr merge lp:~smspillaz/compiz-core/fix-kwd-build-name
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+87939@code.launchpad.net

Description of the change

Fix name collision

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-12-23 03:20:52 +0000
3+++ CMakeLists.txt 2012-01-09 14:50:34 +0000
4@@ -144,6 +144,7 @@
5 add_subdirectory (src)
6 add_subdirectory (xslt)
7 add_subdirectory (plugins)
8+add_subdirectory (tests)
9
10 compiz_ensure_linkage ()
11 compiz_package_generation ("Compiz")
12
13=== modified file 'gtk/window-decorator/metacity.c'
14--- gtk/window-decorator/metacity.c 2011-10-13 12:06:12 +0000
15+++ gtk/window-decorator/metacity.c 2012-01-09 14:50:34 +0000
16@@ -52,7 +52,6 @@
17 gint bottom_stretch_offset;
18 gint left_stretch_offset;
19 gint right_stretch_offset;
20-
21 win_extents = frame_win_extents = d->frame->win_extents;
22 max_win_extents = frame_max_win_extents = d->frame->max_win_extents;
23
24@@ -60,9 +59,19 @@
25 * pixmap type decorations */
26 if (!d->frame_window)
27 {
28- frame_win_extents.left += settings->mutter_draggable_border_width;
29- frame_win_extents.right += settings->mutter_draggable_border_width;
30- frame_win_extents.bottom += settings->mutter_draggable_border_width;
31+ if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
32+ {
33+ frame_win_extents.left += settings->mutter_draggable_border_width;
34+ frame_win_extents.right += settings->mutter_draggable_border_width;
35+ frame_max_win_extents.left += settings->mutter_draggable_border_width;
36+ frame_max_win_extents.right += settings->mutter_draggable_border_width;
37+ }
38+
39+ if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
40+ {
41+ frame_win_extents.bottom += settings->mutter_draggable_border_width;
42+ frame_max_win_extents.bottom += settings->mutter_draggable_border_width;
43+ }
44 }
45
46 w = d->border_layout.top.x2 - d->border_layout.top.x1 -
47@@ -1096,7 +1105,7 @@
48 *x += d->frame->win_extents.left + 4;
49 *y += d->frame->win_extents.top + 2;
50 }
51- else
52+ else if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
53 {
54 *x += settings->mutter_draggable_border_width;
55 }
56
57=== modified file 'kde/window-decorator-kde4/window.cpp'
58--- kde/window-decorator-kde4/window.cpp 2011-09-03 07:56:45 +0000
59+++ kde/window-decorator-kde4/window.cpp 2012-01-09 14:50:34 +0000
60@@ -1043,10 +1043,10 @@
61 {
62 Atom atom = Atoms::compizWindowBlurDecor;
63 QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
64- Region topRegion = NULL;
65- Region bottomRegion = NULL;
66- Region leftRegion = NULL;
67- Region rightRegion = NULL;
68+ ::Region topRegion = NULL;
69+ ::Region bottomRegion = NULL;
70+ ::Region leftRegion = NULL;
71+ ::Region rightRegion = NULL;
72 int size = 0;
73 int w, h;
74
75
76=== modified file 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
77--- src/timer/tests/callbacks/src/test-timer-callbacks.cpp 2011-12-23 05:32:02 +0000
78+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp 2012-01-09 14:50:34 +0000
79@@ -67,12 +67,13 @@
80 CompTimerTestCallbackDispatchTable (),
81 mMainLoop (ml)
82 {
83+ memset (&mCallsCounter, 0, sizeof (mCallsCounter));
84 ON_CALL (*this, callback1 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
85 ON_CALL (*this, callback2 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
86 ON_CALL (*this, callback3 (_)).WillByDefault (Invoke (this, &MockCompTimerTestCallbackDispatchTable::QuitIfLast));
87 };
88
89- void setMax (unsigned int timerId, unsigned int maxCalls)
90+ void setMax (unsigned int timerId, int maxCalls)
91 {
92 mCallsCounter[timerId].maxCalls = maxCalls;
93 }
94@@ -84,15 +85,15 @@
95 {
96 public:
97 unsigned int calls;
98- unsigned int maxCalls;
99+ int maxCalls;
100 } mCallsCounter[3];
101
102 bool QuitIfLast (unsigned int num)
103 {
104 mCallsCounter[num].calls++;
105
106- if (!mCallsCounter[num].maxCalls ||
107- mCallsCounter[num].maxCalls == mCallsCounter[num].calls)
108+ if (mCallsCounter[num].maxCalls < 0 ||
109+ static_cast <unsigned int> (mCallsCounter[num].maxCalls) == mCallsCounter[num].calls)
110 {
111 /* We are the last timer, quit the main loop */
112 if (TimeoutHandler::Default ()->timers ().size () == 0)
113@@ -141,7 +142,7 @@
114 void AddTimer (unsigned int min,
115 unsigned int max,
116 const boost::function <bool ()> &callback,
117- unsigned int maxAllowedCalls)
118+ int maxAllowedCalls)
119 {
120 timers.push_back (new CompTimer ());
121 timers.back ()->setTimes (min, max);

Subscribers

People subscribed via source and target branches