compiz - Jun 2007 - [PATCH] fixes for >=libwnck-2.19.3

Hi.

libwnck broke API with the 2.19.3 release.  This effects compiz as the
WNCK_WINDOW_MODAL_DIALOG is no longer supported by it.  The attached patch
allows compiz to
build against the library.

Thanks.

-- 
Saleem Abdulrasool
compnerd (at) compnerd (dot) org
-------------- next part --------------
--- configure.ac	2007-06-07 10:33:17.000000000 -0500
+++ configure.ac	2007-06-07 10:35:41.000000000 -0500
@@ -288,6 +288,8 @@
 
     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.3,
+		     [have_libwnck_2_19_3=yes], [have_libwnck_2_19_3=no])
 
     if test "x$use_metacity" = "xyes"; then
       PKG_CHECK_MODULES(METACITY, libmetacity-private,
@@ -332,6 +334,10 @@
     AC_DEFINE(HAVE_LIBWNCK_2_18_1, 1,
 	      [Define to 1 if libwnck version >= 2_18_1])
   fi
+  if test "$have_libwnck_2_19_3" = yes; then
+    AC_DEFINE(HAVE_LIBWNCK_2_19_3, 1,
+	      [Define to 1 if libwnck version >= 2_19_3])
+  fi
 fi
 
 AM_CONDITIONAL(USE_METACITY, test "x$use_metacity" =
"xyes")
--- gtk/window-decorator/gtk-window-decorator.c	2007-06-07 10:35:58.000000000
-0500
+++ gtk/window-decorator/gtk-window-decorator.c	2007-06-07 10:36:27.000000000
-0500
@@ -4490,7 +4490,9 @@
 	return;
     case WNCK_WINDOW_NORMAL:
     case WNCK_WINDOW_DIALOG:
+#ifndef HAVE_LIBWNCK_2_19_3
     case WNCK_WINDOW_MODAL_DIALOG:
+#endif
     case WNCK_WINDOW_TOOLBAR:
     case WNCK_WINDOW_MENU:
     case WNCK_WINDOW_UTILITY:

On Thu, 2007-06-07 at 10:45 -0500, compnerd at compnerd.org
wrote:
> Hi.
> 
> libwnck broke API with the 2.19.3 release.  This effects compiz as the
> WNCK_WINDOW_MODAL_DIALOG is no longer supported by it.  The attached patch
allows compiz to
> build against the library.
Thanks.

I made it check for libwnck 2.19.4, as we're already checking for that
version. I hope that's good enough.

-David