Compiz

Merge lp:~muktupavels/compiz/gtk-window-decorator-1 into lp:compiz/0.9.12

  1. gtk-window-decorator-1
  2. Merge into 0.9.12
Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 3883
Merged at revision: 3877
Proposed branch: lp:~muktupavels/compiz/gtk-window-decorator-1
Merge into: lp:compiz/0.9.12
Diff against target: 514 lines (+23/-114)
11 files modified
debian/control (+2/-2)
gtk/CMakeLists.txt (+4/-7)
gtk/config.h.gtk.in (+0/-18)
gtk/window-decorator/actionmenu.c (+0/-5)
gtk/window-decorator/decorator.c (+0/-13)
gtk/window-decorator/events.c (+4/-8)
gtk/window-decorator/gtk-window-decorator.h (+0/-4)
gtk/window-decorator/gwd-metacity-window-decoration-util.c (+2/-0)
gtk/window-decorator/gwd-metacity-window-decoration-util.h (+10/-1)
gtk/window-decorator/metacity.c (+0/-55)
plugins/notification/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~muktupavels/compiz/gtk-window-decorator-1
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Dmitry Shachnev Approve
Review via email: mp+223000@code.launchpad.net

Commit message

This is some preparation work to port gtk-window-decorator to gtk+-3.0.
* Changed gtk_object_destroy to gtk_widget_destory.
* Removed support for old metacity versions.
* Removed support for old wnck versions.

Description of the change

This is some preparation work to port gtk-window-decorator to gtk+-3.0.
* Changed gtk_object_destroy to gtk_widget_destory.
* Removed support for old metacity versions.
* Removed support for old wnck versions.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Have you been already contacting metacity ubuntu maintainers to make sure that libmetacity-private>=3.12.0 will get into the distro?

Also, the debian/control would probably need to increase that build-deb for compiz-gnome.

review: Needs Information
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Have you been already contacting metacity ubuntu maintainers to make sure that
> libmetacity-private>=3.12.0 will get into the distro?

Yes! Dmitry will upload metacity 3.12, but he is waiting for this to be merged. Without this gtk-window-decorator wont build with libmetacity-private >= 3.12.0.

This branch will allow build gwd, but will automatically disable metacity part. gwd needs to be ported to gtk+3 to work with metacity 3.12. I have branch for that, but it is not ready for merging.

> Also, the debian/control would probably need to increase that build-deb for
> compiz-gnome.

Did not understand this part. What should be increased?

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

I am going to upload new Metacity this week.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

In debian/control there's a buid-dependency with:

  libmetacity-dev (>= 1:2.30.3-0ubuntu3)

So I think this should be increased to the new version (at least 2.34) or *temporary* removed if we accept to go without metacity support for a while.

Unity doesn't need that strictly anymore, so ubuntu main either, but ubuntu-gnome flashback does that, so not to regress you should provide the new gtk3-window-decorator before FF so that we can have it for the release.

In general I'd prefer you to upload the new metacity as soon as the port for the compiz decoration would be ready, so to reduce the time where we have a decoration that is not supporting metacity anymore (unless if you build it with distro archives libs).

Another option wouold probably be to rename the new metacity library something like libmetacity3-private, so we can handle the transition period better.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

The library is renamed from libmetacity-private0a to libmetacity-private1. See lp:~mitya57/metacity/3.12.0.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok, that's fine then!

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
lp:~muktupavels/compiz/gtk-window-decorator-1 updated
3883. By Alberts Muktupāvels

Update build dependency

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Marco: can you top-approve this please, now that Alberts fixed the build dependency?

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Here you are ;)

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

What happened to this? Can somebody merge it?

Alberts, can you please propose merge of my metacity branch (lp:~mitya57/metacity/3.12.0) to lp:ubuntu/metacity once this is merged? (I won't have internet connection until next Saturday).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-06-09 13:49:30 +0000
3+++ debian/control 2014-06-20 06:06:50 +0000
4@@ -23,12 +23,12 @@
5 libgtk2.0-dev,
6 libgtk-3-dev,
7 libice-dev (>= 1:1.0.1),
8- libmetacity-dev (>= 1:2.30.3-0ubuntu3),
9+ libmetacity-dev (>= 1:2.34.0),
10 libpango1.0-dev,
11 libpng12-dev | libpng-dev,
12 librsvg2-dev,
13 libsm-dev (>= 1:1.0.1),
14- libwnck-dev,
15+ libwnck-dev (>= 1:2.30.7),
16 libx11-dev,
17 libxcomposite-dev (>= 1:0.3-2),
18 libxext-dev,
19
20=== modified file 'gtk/CMakeLists.txt'
21--- gtk/CMakeLists.txt 2011-10-13 14:06:05 +0000
22+++ gtk/CMakeLists.txt 2014-06-20 06:06:50 +0000
23@@ -21,19 +21,16 @@
24 list (REMOVE_AT CMAKE_REQUIRED_FLAGS REENTRANT_INDEX)
25 list (APPEND CMAKE_REQUIRED_FLAGS "-D_REENTRANT=1")
26 endif (REENTRANT_INDEX)
27- check_function_exists (wnck_window_has_name HAVE_WNCK_WINDOW_HAS_NAME)
28 set (CMAKE_REQUIRED_FLAGS "")
29 set (CMAKE_REQUIRED_LIBRARIES "")
30
31- compiz_pkg_check_modules (HAVE_LIBWNCK_2_18_1 libwnck-1.0>=2.18.1)
32- compiz_pkg_check_modules (HAVE_LIBWNCK_2_19_4 libwnck-1.0>=2.19.4)
33-
34 if (USE_METACITY)
35 pkg_check_modules (METACITY libmetacity-private)
36 if (METACITY_FOUND)
37- compiz_pkg_check_modules (HAVE_METACITY_2_15_21 libmetacity-private>=2.15.21)
38- compiz_pkg_check_modules (HAVE_METACITY_2_17_0 libmetacity-private>=2.17.0)
39- compiz_pkg_check_modules (HAVE_METACITY_2_23_2 libmetacity-private>=2.23.2)
40+ pkg_check_modules (METACITY_3_12_0 libmetacity-private>=3.12.0)
41+ if (METACITY_3_12_0_FOUND)
42+ compiz_set (USE_METACITY 0)
43+ endif (METACITY_3_12_0_FOUND)
44 else (METACITY_FOUND)
45 compiz_set (USE_METACITY 0)
46 endif (METACITY_FOUND)
47
48=== modified file 'gtk/config.h.gtk.in'
49--- gtk/config.h.gtk.in 2008-10-14 10:27:55 +0000
50+++ gtk/config.h.gtk.in 2014-06-20 06:06:50 +0000
51@@ -4,22 +4,4 @@
52 /* Define to 1 if Gconf support is enabled */
53 #cmakedefine USE_GCONF 1
54
55-/* Define to 1 if you have the `wnck_window_has_name' function. */
56-#cmakedefine HAVE_WNCK_WINDOW_HAS_NAME 1
57-
58-/* Define to 1 if libwnck version >= 2_18_1 */
59-#cmakedefine HAVE_LIBWNCK_2_18_1 1
60-
61-/* Define to 1 if libwnck version >= 2_19_4 */
62-#cmakedefine HAVE_LIBWNCK_2_19_4 1
63-
64-/* Define to 1 if metacity version >= 2.15.21 */
65-#cmakedefine HAVE_METACITY_2_15_21 1
66-
67-/* Define to 1 if metacity version >= 2.17.0 */
68-#cmakedefine HAVE_METACITY_2_17_0 1
69-
70-/* Define to 1 if metacity version >= 2.23.2 */
71-#cmakedefine HAVE_METACITY_2_23_2 1
72-
73 #define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
74
75=== modified file 'gtk/window-decorator/actionmenu.c'
76--- gtk/window-decorator/actionmenu.c 2013-09-27 17:17:39 +0000
77+++ gtk/window-decorator/actionmenu.c 2014-06-20 06:06:50 +0000
78@@ -100,11 +100,6 @@
79 return;
80 case WNCK_WINDOW_NORMAL:
81 case WNCK_WINDOW_DIALOG:
82-
83-#ifndef HAVE_LIBWNCK_2_19_4
84- case WNCK_WINDOW_MODAL_DIALOG:
85-#endif
86-
87 case WNCK_WINDOW_TOOLBAR:
88 case WNCK_WINDOW_MENU:
89 case WNCK_WINDOW_UTILITY:
90
91=== modified file 'gtk/window-decorator/decorator.c'
92--- gtk/window-decorator/decorator.c 2013-05-13 15:39:25 +0000
93+++ gtk/window-decorator/decorator.c 2014-06-20 06:06:50 +0000
94@@ -324,21 +324,11 @@
95 WNCK_WINDOW_ACTION_MINIMIZE,
96 0,
97 WNCK_WINDOW_ACTION_SHADE,
98-
99-#ifdef HAVE_LIBWNCK_2_18_1
100 WNCK_WINDOW_ACTION_ABOVE,
101 WNCK_WINDOW_ACTION_STICK,
102 WNCK_WINDOW_ACTION_UNSHADE,
103 WNCK_WINDOW_ACTION_ABOVE,
104 WNCK_WINDOW_ACTION_UNSTICK
105-#else
106- 0,
107- 0,
108- 0,
109- 0,
110- 0
111-#endif
112-
113 };
114
115 /* Reparenting mode - if a box was set and we no longer need it reset its geometry */
116@@ -393,15 +383,12 @@
117 * Description: Wrapper function to either get the name of the window or
118 * return NULL
119 */
120-
121-#ifdef HAVE_WNCK_WINDOW_HAS_NAME
122 static const char *
123 wnck_window_get_real_name (WnckWindow *win)
124 {
125 return wnck_window_has_name (win) ? wnck_window_get_name (win) : NULL;
126 }
127 #define wnck_window_get_name wnck_window_get_real_name
128-#endif
129
130 /*
131 * max_window_name_width
132
133=== modified file 'gtk/window-decorator/events.c'
134--- gtk/window-decorator/events.c 2013-09-27 16:21:43 +0000
135+++ gtk/window-decorator/events.c 2014-06-20 06:06:50 +0000
136@@ -44,7 +44,7 @@
137
138 if (action_menu_mapped)
139 {
140- gtk_object_destroy (GTK_OBJECT (action_menu));
141+ gtk_widget_destroy (action_menu);
142 return;
143 }
144
145@@ -134,7 +134,7 @@
146
147 if (action_menu_mapped && gtkwd_type == GButtonPress)
148 {
149- gtk_object_destroy (GTK_OBJECT (action_menu));
150+ gtk_widget_destroy (action_menu);
151 }
152
153 common_button_event (win, gtkwd_event, gtkwd_type,
154@@ -161,7 +161,7 @@
155
156 if (action_menu_mapped && gtkwd_type == GButtonPress)
157 {
158- gtk_object_destroy (GTK_OBJECT (action_menu));
159+ gtk_widget_destroy (action_menu);
160 }
161
162 if (wnck_window_is_maximized (win))
163@@ -220,7 +220,7 @@
164
165 if (action_menu_mapped && gtkwd_type == GButtonPress)
166 {
167- gtk_object_destroy (GTK_OBJECT (action_menu));
168+ gtk_widget_destroy (action_menu);
169 }
170
171 common_button_event (win, gtkwd_event, gtkwd_type,
172@@ -297,9 +297,7 @@
173 case GButtonRelease:
174 if (gtkwd_event->button == 1)
175 if (state == BUTTON_EVENT_ACTION_STATE)
176-#ifdef HAVE_LIBWNCK_2_18_1
177 wnck_window_make_above (win);
178-#endif
179 break;
180 default:
181 break;
182@@ -365,9 +363,7 @@
183 case GButtonRelease:
184 if (gtkwd_event->button == 1)
185 if (state == BUTTON_EVENT_ACTION_STATE)
186-#ifdef HAVE_LIBWNCK_2_18_1
187 wnck_window_unmake_above (win);
188-#endif
189 break;
190 default:
191 break;
192
193=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
194--- gtk/window-decorator/gtk-window-decorator.h 2013-02-11 17:44:19 +0000
195+++ gtk/window-decorator/gtk-window-decorator.h 2014-06-20 06:06:50 +0000
196@@ -79,10 +79,6 @@
197 #include <libwnck/libwnck.h>
198 #include <libwnck/window-action-menu.h>
199
200-#ifndef HAVE_LIBWNCK_2_19_4
201-#define wnck_window_get_client_window_geometry wnck_window_get_geometry
202-#endif
203-
204 #include <cairo.h>
205 #include <cairo-xlib.h>
206
207
208=== modified file 'gtk/window-decorator/gwd-metacity-window-decoration-util.c'
209--- gtk/window-decorator/gwd-metacity-window-decoration-util.c 2012-09-07 00:30:48 +0000
210+++ gtk/window-decorator/gwd-metacity-window-decoration-util.c 2014-06-20 06:06:50 +0000
211@@ -21,6 +21,7 @@
212 #include <glib.h>
213 #include "gwd-metacity-window-decoration-util.h"
214
215+#ifdef USE_METACITY
216 gboolean
217 gwd_metacity_window_decoration_update_meta_theme (const gchar *theme,
218 GWDMetaThemeGetCurrentProc get_current,
219@@ -43,3 +44,4 @@
220
221 return TRUE;
222 }
223+#endif
224
225=== modified file 'gtk/window-decorator/gwd-metacity-window-decoration-util.h'
226--- gtk/window-decorator/gwd-metacity-window-decoration-util.h 2012-10-03 10:50:07 +0000
227+++ gtk/window-decorator/gwd-metacity-window-decoration-util.h 2014-06-20 06:06:50 +0000
228@@ -20,11 +20,19 @@
229 #ifndef _GWD_METACITY_WINDOW_DECORATION_UTIL_H
230 #define _GWD_METACITY_WINDOW_DECORATION_UTIL_H
231
232+#ifdef HAVE_CONFIG_H
233+#include <config.h>
234+#endif
235+
236 #include <glib.h>
237-#include <metacity-1/metacity-private/theme.h>
238+
239+#ifdef USE_METACITY
240+#include <metacity-private/theme.h>
241+#endif
242
243 G_BEGIN_DECLS
244
245+#ifdef USE_METACITY
246 typedef MetaTheme * (*GWDMetaThemeGetCurrentProc) ();
247 typedef void (*GWDMetaThemeSetProc) (const gchar *theme,
248 gboolean force_update);
249@@ -33,6 +41,7 @@
250 gwd_metacity_window_decoration_update_meta_theme (const gchar *theme,
251 GWDMetaThemeGetCurrentProc get_current,
252 GWDMetaThemeSetProc set_current);
253+#endif
254
255 G_END_DECLS;
256
257
258=== modified file 'gtk/window-decorator/metacity.c'
259--- gtk/window-decorator/metacity.c 2013-10-01 12:26:20 +0000
260+++ gtk/window-decorator/metacity.c 2014-06-20 06:06:50 +0000
261@@ -157,19 +157,10 @@
262 int *bottom_left_radius,
263 int *bottom_right_radius)
264 {
265-
266-#ifdef HAVE_METACITY_2_17_0
267 *top_left_radius = fgeom->top_left_corner_rounded_radius;
268 *top_right_radius = fgeom->top_right_corner_rounded_radius;
269 *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius;
270 *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius;
271-#else
272- *top_left_radius = fgeom->top_left_corner_rounded ? 5 : 0;
273- *top_right_radius = fgeom->top_right_corner_rounded ? 5 : 0;
274- *bottom_left_radius = fgeom->bottom_left_corner_rounded ? 5 : 0;
275- *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0;
276-#endif
277-
278 }
279
280 static int
281@@ -378,8 +369,6 @@
282 return META_BUTTON_TYPE_MAXIMIZE;
283 case META_BUTTON_FUNCTION_CLOSE:
284 return META_BUTTON_TYPE_CLOSE;
285-
286-#ifdef HAVE_METACITY_2_17_0
287 case META_BUTTON_FUNCTION_SHADE:
288 return META_BUTTON_TYPE_SHADE;
289 case META_BUTTON_FUNCTION_ABOVE:
290@@ -392,8 +381,6 @@
291 return META_BUTTON_TYPE_UNABOVE;
292 case META_BUTTON_FUNCTION_UNSTICK:
293 return META_BUTTON_TYPE_UNSTICK;
294-#endif
295-
296 default:
297 break;
298 }
299@@ -436,8 +423,6 @@
300 return meta_button_state (d->button_states[BUTTON_MIN]);
301 case META_BUTTON_TYPE_MENU:
302 return meta_button_state (d->button_states[BUTTON_MENU]);
303-
304-#ifdef HAVE_METACITY_2_17_0
305 case META_BUTTON_TYPE_SHADE:
306 return meta_button_state (d->button_states[BUTTON_SHADE]);
307 case META_BUTTON_TYPE_ABOVE:
308@@ -450,8 +435,6 @@
309 return meta_button_state (d->button_states[BUTTON_UNABOVE]);
310 case META_BUTTON_TYPE_UNSTICK:
311 return meta_button_state (d->button_states[BUTTON_UNSTICK]);
312-#endif
313-
314 default:
315 break;
316 }
317@@ -539,10 +522,8 @@
318 if (d->state & WNCK_WINDOW_STATE_SHADED)
319 *flags |= (MetaFrameFlags ) META_FRAME_SHADED;
320
321-#ifdef HAVE_METACITY_2_17_0
322 if (d->state & WNCK_WINDOW_STATE_ABOVE)
323 *flags |= (MetaFrameFlags ) META_FRAME_ABOVE;
324-#endif
325
326 meta_theme_get_frame_borders (theme,
327 frame_type,
328@@ -661,7 +642,6 @@
329 bg_color = style->bg[GTK_STATE_NORMAL];
330 bg_alpha = 1.0;
331
332-#ifdef HAVE_METACITY_2_17_0
333 if (frame_style->window_background_color)
334 {
335 meta_color_spec_render (frame_style->window_background_color,
336@@ -670,7 +650,6 @@
337
338 bg_alpha = frame_style->window_background_alpha / 255.0;
339 }
340-#endif
341
342 cairo_destroy (cr);
343
344@@ -992,11 +971,7 @@
345
346 GdkRectangle clip;
347
348-#ifdef HAVE_METACITY_2_15_21
349 MetaButtonSpace *space;
350-#else
351- GdkRectangle *space;
352-#endif
353
354 gint mutter_draggable_border_width = 0;
355
356@@ -1041,8 +1016,6 @@
357
358 space = &fgeom.close_rect;
359 break;
360-
361-#if defined (HAVE_METACITY_2_17_0) && defined (HAVE_LIBWNCK_2_18_1)
362 case BUTTON_SHADE:
363 if (!meta_button_present (&button_layout, META_BUTTON_FUNCTION_SHADE))
364 return FALSE;
365@@ -1079,13 +1052,10 @@
366
367 space = &fgeom.unstick_rect;
368 break;
369-#endif
370-
371 default:
372 return FALSE;
373 }
374
375-#ifdef HAVE_METACITY_2_15_21
376 if (!space->clickable.width && !space->clickable.height)
377 return FALSE;
378
379@@ -1093,15 +1063,6 @@
380 *y = space->clickable.y;
381 *w = space->clickable.width;
382 *h = space->clickable.height;
383-#else
384- if (!space->width && !space->height)
385- return FALSE;
386-
387- *x = space->x;
388- *y = space->y;
389- *w = space->width;
390- *h = space->height;
391-#endif
392
393 if (d->frame_window)
394 {
395@@ -1502,8 +1463,6 @@
396 return META_BUTTON_FUNCTION_MAXIMIZE;
397 else if (strcmp (str, "close") == 0)
398 return META_BUTTON_FUNCTION_CLOSE;
399-
400-#ifdef HAVE_METACITY_2_17_0
401 else if (strcmp (str, "shade") == 0)
402 return META_BUTTON_FUNCTION_SHADE;
403 else if (strcmp (str, "above") == 0)
404@@ -1516,8 +1475,6 @@
405 return META_BUTTON_FUNCTION_UNABOVE;
406 else if (strcmp (str, "unstick") == 0)
407 return META_BUTTON_FUNCTION_UNSTICK;
408-#endif
409-
410 else
411 return META_BUTTON_FUNCTION_LAST;
412 }
413@@ -1527,7 +1484,6 @@
414 {
415 switch (ofwhat)
416 {
417-#ifdef HAVE_METACITY_2_17_0
418 case META_BUTTON_FUNCTION_SHADE:
419 return META_BUTTON_FUNCTION_UNSHADE;
420 case META_BUTTON_FUNCTION_UNSHADE:
421@@ -1542,7 +1498,6 @@
422 return META_BUTTON_FUNCTION_UNSTICK;
423 case META_BUTTON_FUNCTION_UNSTICK:
424 return META_BUTTON_FUNCTION_STICK;
425-#endif
426
427 default:
428 return META_BUTTON_FUNCTION_LAST;
429@@ -1558,10 +1513,8 @@
430 {
431 layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
432 layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
433-#ifdef HAVE_METACITY_2_23_2
434 layout->left_buttons_has_spacer[i] = FALSE;
435 layout->right_buttons_has_spacer[i] = FALSE;
436-#endif
437 }
438 }
439
440@@ -1592,7 +1545,6 @@
441 while (buttons[b] != NULL)
442 {
443 f = meta_button_function_from_string (buttons[b]);
444-#ifdef HAVE_METACITY_2_23_2
445 if (i > 0 && strcmp ("spacer", buttons[b]) == 0)
446 {
447 new_layout.left_buttons_has_spacer[i - 1] = TRUE;
448@@ -1602,7 +1554,6 @@
449 new_layout.left_buttons_has_spacer[i - 2] = TRUE;
450 }
451 else
452-#endif
453 {
454 if (f != META_BUTTON_FUNCTION_LAST && !used[f])
455 {
456@@ -1639,7 +1590,6 @@
457 while (buttons[b] != NULL)
458 {
459 f = meta_button_function_from_string (buttons[b]);
460-#ifdef HAVE_METACITY_2_23_2
461 if (i > 0 && strcmp ("spacer", buttons[b]) == 0)
462 {
463 new_layout.right_buttons_has_spacer[i - 1] = TRUE;
464@@ -1648,7 +1598,6 @@
465 new_layout.right_buttons_has_spacer[i - 2] = TRUE;
466 }
467 else
468-#endif
469 {
470 if (f != META_BUTTON_FUNCTION_LAST && !used[f])
471 {
472@@ -1692,14 +1641,12 @@
473 for (j = 0; j < i; ++j)
474 {
475 rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1];
476-#ifdef HAVE_METACITY_2_23_2
477 if (j == 0)
478 rtl_layout.right_buttons_has_spacer[i - 1] =
479 new_layout.left_buttons_has_spacer[i - j - 1];
480 else
481 rtl_layout.right_buttons_has_spacer[j - 1] =
482 new_layout.left_buttons_has_spacer[i - j - 1];
483-#endif
484 }
485
486 i = 0;
487@@ -1709,14 +1656,12 @@
488 for (j = 0; j < i; ++j)
489 {
490 rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1];
491-#ifdef HAVE_METACITY_2_23_2
492 if (j == 0)
493 rtl_layout.left_buttons_has_spacer[i - 1] =
494 new_layout.right_buttons_has_spacer[i - j - 1];
495 else
496 rtl_layout.left_buttons_has_spacer[j - 1] =
497 new_layout.right_buttons_has_spacer[i - j - 1];
498-#endif
499 }
500
501 new_layout = rtl_layout;
502
503=== modified file 'plugins/notification/CMakeLists.txt'
504--- plugins/notification/CMakeLists.txt 2012-05-16 17:43:51 +0000
505+++ plugins/notification/CMakeLists.txt 2014-06-20 06:06:50 +0000
506@@ -2,7 +2,7 @@
507
508 include (CompizPlugin)
509
510-compiz_plugin (notification PKGDEPS libnotify gtk+-2.0)
511+compiz_plugin (notification PKGDEPS libnotify)
512 compiz_pkg_check_modules (HAVE_LIBNOTIFY_0_6_1 libnotify>=0.6.1)
513 if (HAVE_LIBNOTIFY_0_6_1_FOUND)
514 add_definitions (-DHAVE_LIBNOTIFY_0_6_1)

Subscribers

People subscribed via source and target branches