compiz team mailing list archive
-
compiz team
-
Mailing list archive
-
Message #14235
[Merge] lp:~smspillaz/compiz/compiz.fix_737707 into lp:compiz
Sam "SmSpillaz" Spilsbury has proposed merging lp:~smspillaz/compiz/compiz.fix_737707 into lp:compiz.
Requested reviews:
compiz packagers (compiz)
For more details, see:
https://code.launchpad.net/~smspillaz/compiz/compiz.fix_737707/+merge/56429
Fixes launchpad bug #737067, "resize padding too small" by ensuring that the default decorations still get the right shadows and padding
--
https://code.launchpad.net/~smspillaz/compiz/compiz.fix_737707/+merge/56429
Your team compiz packagers is requested to review the proposed merge of lp:~smspillaz/compiz/compiz.fix_737707 into lp:compiz.
=== modified file 'debian/patches/01_unity_window_decorator.patch'
--- debian/patches/01_unity_window_decorator.patch 2011-03-23 04:14:20 +0000
+++ debian/patches/01_unity_window_decorator.patch 2011-04-05 18:41:09 +0000
@@ -65,7 +65,7 @@
Index: compiz-0.9.4git20110322/CMakeLists.txt
===================================================================
--- compiz-0.9.4git20110322.orig/CMakeLists.txt 2011-03-22 16:46:56.000000000 +0800
-+++ compiz-0.9.4git20110322/CMakeLists.txt 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/CMakeLists.txt 2011-04-06 02:00:08.179163096 +0800
@@ -112,6 +112,7 @@
add_subdirectory (libdecoration)
add_subdirectory (gtk)
@@ -77,13 +77,13 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/.gitignore
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/.gitignore 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/.gitignore 2011-04-06 02:00:08.179163096 +0800
@@ -0,0 +1 @@
+po/compiz.pot
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/AUTHORS
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/AUTHORS 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/AUTHORS 2011-04-06 02:00:08.179163096 +0800
@@ -0,0 +1,29 @@
+compiz and the standard set of plugins are designed and written by
+
@@ -117,7 +117,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/CMakeLists.txt 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/CMakeLists.txt 2011-04-06 02:00:08.183163109 +0800
@@ -0,0 +1,38 @@
+project (unity-window-decorator)
+
@@ -160,7 +160,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING 2011-04-06 02:00:08.183163109 +0800
@@ -0,0 +1,6 @@
+Most of the code is MIT licensed, some code is instead licensed
+under the LGPL and some under the GPL. Each source code file
@@ -171,7 +171,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING.GPL
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING.GPL 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/COPYING.GPL 2011-04-06 02:00:08.187163132 +0800
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
@@ -516,7 +516,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/INSTALL
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/INSTALL 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/INSTALL 2011-04-06 02:00:08.187163132 +0800
@@ -0,0 +1,14 @@
+compiz uses libstartup-notification which is available at
+ftp://ftp.gnome.org/pub/GNOME/sources/startup-notification/
@@ -535,7 +535,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/README
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/README 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/README 2011-04-06 02:00:08.187163132 +0800
@@ -0,0 +1,8 @@
+compiz - OpenGL window and compositing manager
+
@@ -548,7 +548,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/CMakeLists.txt 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/CMakeLists.txt 2011-04-06 02:00:08.191163158 +0800
@@ -0,0 +1,161 @@
+function (compiz_install_gconf_schema _src _dst)
+ pkg_check_modules (GCONF gconf-2.0)
@@ -714,7 +714,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/TODO
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/TODO 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/TODO 2011-04-06 02:00:08.191163158 +0800
@@ -0,0 +1,6 @@
+
+* Plugin interface
@@ -726,7 +726,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/actionmenu.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/actionmenu.c 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/actionmenu.c 2011-04-06 02:00:08.191163158 +0800
@@ -0,0 +1,109 @@
+#include "gtk-window-decorator.h"
+
@@ -840,7 +840,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/blurprops.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/blurprops.c 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/blurprops.c 2011-04-06 02:00:08.195163173 +0800
@@ -0,0 +1,68 @@
+#include "gtk-window-decorator.h"
+
@@ -914,7 +914,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/cairo.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/cairo.c 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/cairo.c 2011-04-06 02:00:08.199163192 +0800
@@ -0,0 +1,1001 @@
+#include "gtk-window-decorator.h"
+
@@ -1920,7 +1920,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/config.h.gtk.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/config.h.gtk.in 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/config.h.gtk.in 2011-04-06 02:00:08.199163192 +0800
@@ -0,0 +1,25 @@
+/* Define to 1 if Metacity support is enabled */
+#cmakedefine USE_METACITY 1
@@ -1950,8 +1950,8 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorator.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorator.c 2011-03-23 11:45:03.602056472 +0800
-@@ -0,0 +1,870 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorator.c 2011-04-06 02:26:14.362929384 +0800
+@@ -0,0 +1,876 @@
+#include "gtk-window-decorator.h"
+
+static const PangoFontDescription *
@@ -2669,7 +2669,9 @@
+ decor_t d;
+ gint nQuad;
+ decor_quad_t quads[N_QUADS_MAX];
-+ decor_extents_t extents = _win_extents;
++ decor_extents_t extents = extents, frame_extents, max_extents, frame_max_extents;
++
++ (*theme_get_border_extents) (&extents, &frame_extents, &max_extents, &frame_max_extents);
+
+ xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
+
@@ -2727,16 +2729,8 @@
+
+ memset (&d, 0, sizeof (d));
+
-+ if (d.active)
-+ {
-+ d.context = &window_active_context;
-+ d.shadow = border_active_shadow;
-+ }
-+ else
-+ {
-+ d.context = &window_inactive_context;
-+ d.shadow = border_inactive_shadow;
-+ }
++ d.context = &window_inactive_context;
++ d.shadow = border_inactive_shadow;
+
+ d.layout = pango_layout_new (pango_context);
+
@@ -2745,8 +2739,6 @@
+ d.width = d.border_layout.width;
+ d.height = d.border_layout.height;
+
-+ extents.top += titlebar_height;
-+
+ d.draw = theme_draw_window_decoration;
+
+ if (decor_normal_pixmap)
@@ -2769,10 +2761,8 @@
+
+ XRenderFreePicture (xdisplay, d.picture);
+
-+ fprintf (stderr, "extents are %i %i %i %i %i\n", extents.left, extents.right, extents.top, extents.bottom);
-+
+ decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap),
-+ &extents, &extents, &extents, &extents, 0, 0, quads, nQuad);
++ &frame_extents, &extents, &frame_max_extents, &max_extents, 0, 0, quads, nQuad);
+
+ XChangeProperty (xdisplay, xroot,
+ normalAtom,
@@ -2784,6 +2774,22 @@
+ if (decor_active_pixmap)
+ g_object_unref (G_OBJECT (decor_active_pixmap));
+
++ if (d.layout)
++ g_object_unref (G_OBJECT (d.layout));
++
++ d.context = &window_active_context;
++ d.shadow = border_active_shadow;
++
++ d.layout = pango_layout_new (pango_context);
++
++ decor_get_default_layout (d.context, 1, 1, &d.border_layout);
++
++ d.width = d.border_layout.width;
++ d.height = d.border_layout.height;
++
++ nQuad = decor_set_lSrStSbS_window_quads (quads, d.context,
++ &d.border_layout);
++
+ decor_active_pixmap = create_pixmap (d.width, d.height, 32);
+
+ if (decor_active_pixmap)
@@ -2799,7 +2805,7 @@
+ XRenderFreePicture (xdisplay, d.picture);
+
+ decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap),
-+ &extents, &extents, &extents, &extents, 0, 0, quads, nQuad);
++ &frame_extents, &extents, &frame_max_extents, &max_extents, 0, 0, quads, nQuad);
+
+ XChangeProperty (xdisplay, xroot,
+ activeAtom,
@@ -2825,11 +2831,26 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorprops.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorprops.c 2011-03-23 11:45:03.602056472 +0800
-@@ -0,0 +1,135 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/decorprops.c 2011-04-06 02:00:08.203163217 +0800
+@@ -0,0 +1,150 @@
+#include "gtk-window-decorator.h"
+
+void
++get_border_extents (decor_extents_t *extents,
++ decor_extents_t *frame_extents,
++ decor_extents_t *max_extents,
++ decor_extents_t *frame_max_extents)
++{
++ *extents = *frame_extents = _win_extents;
++ *max_extents = *frame_max_extents = _max_win_extents;
++
++ extents->top += titlebar_height;
++ frame_extents->top += titlebar_height;
++ max_extents->top += max_titlebar_height;
++ frame_max_extents->top += max_titlebar_height;
++}
++
++void
+decor_update_window_property (decor_t *d)
+{
+ long data[256];
@@ -2965,7 +2986,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/events.c 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/events.c 2011-04-06 02:00:08.211163250 +0800
@@ -0,0 +1,1173 @@
+#include "gtk-window-decorator.h"
+
@@ -4143,7 +4164,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/forcequit.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/forcequit.c 2011-03-23 11:45:03.602056472 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/forcequit.c 2011-04-06 02:00:08.211163250 +0800
@@ -0,0 +1,176 @@
+#include "gtk-window-decorator.h"
+
@@ -4324,7 +4345,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gdk.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gdk.c 2011-03-23 11:45:03.612056499 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gdk.c 2011-04-06 02:00:08.211163250 +0800
@@ -0,0 +1,87 @@
+#include "gtk-window-decorator.h"
+
@@ -4417,8 +4438,8 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-03-23 11:45:03.612056499 +0800
-@@ -0,0 +1,443 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.c 2011-04-06 02:00:08.215163276 +0800
+@@ -0,0 +1,445 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
@@ -4714,6 +4735,7 @@
+ theme_get_button_position = get_button_position;
+ theme_update_shadow = cairo_update_shadow;
+ theme_get_shadow = get_shadow;
++ theme_get_border_extents = get_border_extents;
+
+#ifdef USE_METACITY
+ if (meta_theme)
@@ -4728,6 +4750,7 @@
+ theme_get_button_position = meta_get_button_position;
+ theme_update_shadow = meta_update_shadow;
+ theme_get_shadow = meta_get_shadow;
++ theme_get_border_extents = meta_get_border_extents;
+ }
+ }
+#endif
@@ -4865,8 +4888,8 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.h 2011-03-23 11:45:03.612056499 +0800
-@@ -0,0 +1,980 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gtk-window-decorator.h 2011-04-06 02:00:08.219163291 +0800
+@@ -0,0 +1,997 @@
+#ifndef _GTK_WINDOW_DECORATOR_H
+#define _GTK_WINDOW_DECORATOR_H
+#ifdef HAVE_CONFIG_H
@@ -5302,6 +5325,11 @@
+void (*theme_get_shadow) (decor_t *d,
+ gint shadow_type);
+
++void (*theme_get_border_extents) (decor_extents_t *extents,
++ decor_extents_t *frame_extents,
++ decor_extents_t *extents_max,
++ decor_extents_t *frame_extents_max);
++
+extern char *program_name;
+
+extern GtkWidget *style_window_rgba;
@@ -5504,6 +5532,12 @@
+void
+update_border_extents (gint text_height);
+
++void
++get_border_extents (decor_extents_t *extents,
++ decor_extents_t *frame_extents,
++ decor_extents_t *extents_max,
++ decor_extents_t *frame_extents_max);
++
+gboolean
+get_button_position (decor_t *d,
+ gint i,
@@ -5607,6 +5641,12 @@
+meta_update_border_extents (gint text_height);
+
+void
++meta_get_border_extents (decor_extents_t *extents,
++ decor_extents_t *frame_extents,
++ decor_extents_t *extents_max,
++ decor_extents_t *frame_extents_max);
++
++void
+meta_update_button_layout (const char *value);
+
+decor_shadow_t *
@@ -5850,7 +5890,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/gwd.schemas.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gwd.schemas.in 2011-03-23 11:45:03.612056499 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/gwd.schemas.in 2011-04-06 02:00:08.219163291 +0800
@@ -0,0 +1,81 @@
+<gconfschemafile>
+ <schemalist>
@@ -5936,8 +5976,8 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/metacity.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/metacity.c 2011-03-23 12:12:13.344446799 +0800
-@@ -0,0 +1,1923 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/metacity.c 2011-04-06 02:00:08.227163332 +0800
+@@ -0,0 +1,1965 @@
+#include "gtk-window-decorator.h"
+
+#ifdef USE_METACITY
@@ -5950,6 +5990,48 @@
+gboolean meta_button_layout_set = FALSE;
+MetaButtonLayout meta_button_layout;
+
++void
++meta_get_border_extents (decor_extents_t *extents,
++ decor_extents_t *frame_extents,
++ decor_extents_t *max_extents,
++ decor_extents_t *frame_max_extents)
++{
++ MetaTheme *theme;
++ MetaFrameStyle *frame_style;
++ MetaFrameFlags flags;
++ MetaInvisibleGrabAreaProperties *invisible_grab_area_properties;
++
++ theme = meta_theme_get_current ();
++
++ if (!theme)
++ return;
++
++ memset (&flags, 0, sizeof (flags));
++
++ frame_style = meta_theme_get_frame_style (theme, META_FRAME_TYPE_NORMAL, flags);
++
++ if (!frame_style)
++ return;
++
++ *extents = *frame_extents = _win_extents;
++ *max_extents = *frame_max_extents = _max_win_extents;
++
++ invisible_grab_area_properties =
++ meta_frame_style_get_invisible_grab_area_properties (frame_style);
++
++ if (invisible_grab_area_properties)
++ {
++ frame_extents->left += invisible_grab_area_properties->left;
++ frame_extents->right += invisible_grab_area_properties->right;
++ frame_extents->bottom += invisible_grab_area_properties->bottom;
++ }
++
++ extents->top += titlebar_height;
++ frame_extents->top += titlebar_height;
++ max_extents->top += max_titlebar_height;
++ frame_max_extents->top += max_titlebar_height;
++}
++
+static void
+decor_update_meta_window_property (decor_t *d,
+ MetaTheme *theme,
@@ -7864,8 +7946,8 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/settings.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/settings.c 2011-03-23 11:45:03.622056507 +0800
-@@ -0,0 +1,564 @@
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/settings.c 2011-04-06 02:00:08.231163357 +0800
+@@ -0,0 +1,567 @@
+#include "gtk-window-decorator.h"
+
+/* TODO: Trash all of this and use a window property
@@ -8033,6 +8115,7 @@
+ theme_get_button_position = meta_get_button_position;
+ theme_update_shadow = meta_update_shadow;
+ theme_get_shadow = meta_get_shadow;
++ theme_get_border_extents = meta_get_border_extents;
+ }
+ else
+ {
@@ -8043,6 +8126,7 @@
+ theme_get_button_position = get_button_position;
+ theme_update_shadow = cairo_update_shadow;
+ theme_get_shadow = get_shadow;
++ theme_get_border_extents = get_border_extents;
+ }
+
+ return TRUE;
@@ -8052,6 +8136,7 @@
+ theme_update_border_extents = update_border_extents;
+ theme_get_event_window_position = get_event_window_position;
+ theme_get_button_position = get_button_position;
++ theme_get_border_extents = get_border_extents;
+
+ return FALSE;
+#endif
@@ -8433,7 +8518,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/style.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/style.c 2011-03-23 11:45:03.622056507 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/style.c 2011-04-06 02:00:08.231163357 +0800
@@ -0,0 +1,42 @@
+#include "gtk-window-decorator.h"
+
@@ -8480,7 +8565,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/switcher.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/switcher.c 2011-03-23 11:45:03.622056507 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/switcher.c 2011-04-06 02:00:08.235163371 +0800
@@ -0,0 +1,455 @@
+#include "gtk-window-decorator.h"
+
@@ -8940,7 +9025,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/util.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/util.c 2011-03-23 11:45:03.622056507 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/util.c 2011-04-06 02:00:08.235163371 +0800
@@ -0,0 +1,278 @@
+#include "gtk-window-decorator.h"
+
@@ -9223,7 +9308,7 @@
Index: compiz-0.9.4git20110322/unity/unity_window_decorator/src/wnck.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/wnck.c 2011-03-23 12:08:41.634136287 +0800
++++ compiz-0.9.4git20110322/unity/unity_window_decorator/src/wnck.c 2011-04-06 02:00:08.239163388 +0800
@@ -0,0 +1,772 @@
+#include "gtk-window-decorator.h"
+
@@ -9772,7 +9857,7 @@
+ */
+ if (d->transient_parent)
+ {
-+ decor_t *d_parent = g_object_get_data (d->transient_parent, "decor");
++ decor_t *d_parent = g_object_get_data (G_OBJECT (d->transient_parent), "decor");
+ queue_decor_draw (d_parent);
+ }
+
@@ -9842,7 +9927,7 @@
+ */
+ if (d->transient_parent)
+ {
-+ decor_t *d_parent = g_object_get_data (d->transient_parent, "decor");
++ decor_t *d_parent = g_object_get_data (G_OBJECT (d->transient_parent), "decor");
+ queue_decor_draw (d_parent);
+ }
+ }
Follow ups
