metacity r3772 - in trunk: . src/compositor src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sun Jun 29 03:23:08 2008
New Revision: 3772
URL: http://svn.gnome.org/viewvc/metacity?rev=3772&view=rev

Log:
2008-06-28  Thomas Thurman  <tthurman gnome org>

        * src/core/display.c, src/compositor/compositor-xrender.c: add checks
          for HAVE_SHAPE where appropriate.
        * src/core/xprops.c: fix type error which was causing warnings.



Modified:
   trunk/ChangeLog
   trunk/src/compositor/compositor-xrender.c
   trunk/src/core/display.c
   trunk/src/core/xprops.c

Modified: trunk/src/compositor/compositor-xrender.c
==============================================================================
--- trunk/src/compositor/compositor-xrender.c	(original)
+++ trunk/src/compositor/compositor-xrender.c	Sun Jun 29 03:23:08 2008
@@ -2802,8 +2802,10 @@
     default:
       if (event->type == meta_display_get_damage_event_base (xrc->display) + XDamageNotify) 
         process_damage (xrc, (XDamageNotifyEvent *) event);
+#ifdef HAVE_SHAPE
       else if (event->type == meta_display_get_shape_event_base (xrc->display) + ShapeNotify) 
         process_shape (xrc, (XShapeEvent *) event);
+#endif /* HAVE_SHAPE */
       else 
         {
           meta_error_trap_pop (xrc->display, FALSE);

Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c	(original)
+++ trunk/src/core/display.c	Sun Jun 29 03:23:08 2008
@@ -5166,9 +5166,11 @@
 #endif
 
 #ifdef HAVE_COMPOSITE_EXTENSIONS
+#ifdef HAVE_SHAPE
 int
 meta_display_get_shape_event_base (MetaDisplay *display)
 {
   return display->shape_event_base;
 }
 #endif
+#endif

Modified: trunk/src/core/xprops.c
==============================================================================
--- trunk/src/core/xprops.c	(original)
+++ trunk/src/core/xprops.c	Sun Jun 29 03:23:08 2008
@@ -1051,7 +1051,7 @@
                                       &results.type, &results.format,
                                       &results.n_items,
                                       &results.bytes_after,
-                                      (gchar **)&results.prop) != Success ||
+                                      (unsigned char **)(&results.prop)) != Success ||
           results.type == None)
         {
           values[i].type = META_PROP_VALUE_INVALID;