[beryl-commits] compiz mirror: Changes to 'master' (5425a219f5b4f2946a1c4a1b6e4d3b1bee86fc21)

[compiz at server.beryl-project.org]

New commits:
commit 5425a219f5b4f2946a1c4a1b6e4d3b1bee86fc21
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date:   Thu Jun 21 14:23:38 2007 +0200

    Fixed client resize problems with libwnck >= 2.19.4.


 configure.ac                                |    7 +++++++
 gtk/window-decorator/gtk-window-decorator.c |    4 ++++
 2 files changed, 11 insertions(+), 0 deletions(-)


Modified: compiz/configure.ac
===================================================================
--- compiz/configure.ac
+++ compiz/configure.ac
@@ -288,6 +288,9 @@ if test "x$use_gtk" = "xyes"; then
     PKG_CHECK_EXISTS(libwnck-1.0 >= 2.18.1,
 		     [have_libwnck_2_18_1=yes], [have_libwnck_2_18_1=no])
 
+	PKG_CHECK_EXISTS(libwnck-1.0 >= 2.19.4,
+		     [have_libwnck_2_19_4=yes], [have_libwnck_2_19_4=no])
+
     if test "x$use_metacity" = "xyes"; then
       PKG_CHECK_MODULES(METACITY, libmetacity-private,
 			[use_metacity=yes], [use_metacity=no])
@@ -331,6 +334,10 @@ if test "$use_gtk" = yes; then
     AC_DEFINE(HAVE_LIBWNCK_2_18_1, 1,
 	      [Define to 1 if libwnck version >= 2_18_1])
   fi
+  if test "$have_libwnck_2_19_4" = yes; then
+    AC_DEFINE(HAVE_LIBWNCK_2_19_4, 1,
+	      [Define to 1 if libwnck version >= 2_19_4])
+  fi
 fi
 
 AM_CONDITIONAL(USE_METACITY, test "x$use_metacity" = "xyes")

Modified: compiz/gtk/window-decorator/gtk-window-decorator.c
===================================================================
--- compiz/gtk/window-decorator/gtk-window-decorator.c
+++ compiz/gtk/window-decorator/gtk-window-decorator.c
@@ -56,6 +56,10 @@
 #include <libwnck/libwnck.h>
 #include <libwnck/window-action-menu.h>
 
+#if defined (HAVE_LIBWNCK_2_19_4)
+#define wnck_window_get_geometry wnck_window_get_client_window_geometry
+#endif
+
 #include <cairo.h>
 #include <cairo-xlib.h>