Hi,

It seems that sometimes it happens that there's a gconf entry for the
metacity theme, but that metacity theme does not exist. The result is
gtk-window-decorator failing to start.

The attached patch fixes this by checking whether the theme was set
successfully, and falls back to the default compiz theme (by setting
use_meta_theme to FALSE) if not. Could this be included in compiz?

 - Thierry

Use GdkRectangle instead of MetaButtonSpace for backwards compatibility with
older versions of libmetacity.

Index: gtk/window-decorator/gtk-window-decorator.c
===================================================================
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -2803,7 +2803,7 @@
     MetaFrameFlags    flags;
     MetaTheme        *theme;
     GdkRectangle      clip;
-    MetaButtonSpace   *space;
+    GdkRectangle      *space;
 
     theme = meta_theme_get_current ();
 
@@ -2823,10 +2823,10 @@
        break;
     }
 
-    *x = space->clickable.x;
-    *y = space->clickable.y;
-    *w = space->clickable.width;
-    *h = space->clickable.height;
+    *x = space->x;
+    *y = space->y;
+    *w = space->width;
+    *h = space->height;
 }
 #endif
 
Index: configure.ac
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,7 @@
     LIBS="$save_LIBS"
 
     if test "x$use_metacity" = "xyes"; then
-      PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.15.21,
+      PKG_CHECK_MODULES(METACITY, libmetacity-private,
                        [use_metacity=yes], [use_metacity=no])
     fi
 

Attachment: signature.asc
Description: Digital signature

_______________________________________________
compiz mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/compiz

Reply via email to