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

[compiz at server.beryl-project.org]

New commits:
commit de422a196a4a7de3fb246dc854aad43dc27b75f1
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 16:06:34 2007 -0400

    WNCK_WINDOW_MODAL_DIALOG doesn't exist in libwnck 2.19.4
    and later.

commit e7d8db1ee2c0b5d7dd4bbae3f4dcc1af873fe66e
Author: David Reveman <davidr at novell.com>
Date:   Thu Jun 21 16:04:55 2007 -0400

    Use consistent preprocessor macros.


 gtk/window-decorator/gtk-window-decorator.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


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,7 +56,7 @@
 #include <libwnck/libwnck.h>
 #include <libwnck/window-action-menu.h>
 
-#if defined (HAVE_LIBWNCK_2_19_4)
+#ifdef HAVE_LIBWNCK_2_19_4
 #define wnck_window_get_geometry wnck_window_get_client_window_geometry
 #endif
 
@@ -3110,7 +3110,7 @@ update_event_windows (WnckWindow *win)
     gdk_error_trap_pop ();
 }
 
-#if HAVE_WNCK_WINDOW_HAS_NAME
+#ifdef HAVE_WNCK_WINDOW_HAS_NAME
 static const char *
 wnck_window_get_real_name (WnckWindow *win)
 {
@@ -4494,7 +4494,11 @@ action_menu_map (WnckWindow *win,
 	return;
     case WNCK_WINDOW_NORMAL:
     case WNCK_WINDOW_DIALOG:
+
+#ifndef HAVE_LIBWNCK_2_19_4
     case WNCK_WINDOW_MODAL_DIALOG:
+#endif
+
     case WNCK_WINDOW_TOOLBAR:
     case WNCK_WINDOW_MENU:
     case WNCK_WINDOW_UTILITY: