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

[tthurman svn gnome org]

Author: tthurman
Date: Mon Dec  1 22:54:57 2008
New Revision: 4045
URL: http://svn.gnome.org/viewvc/metacity?rev=4045&view=rev

Log:
	* configure.in: gnome-doc-tools version doesn't need to be so high.
	* src/compositor/compositor-xrender.c: disable the entire file if the
          compositor is disabled.
	* src/core/async-getprop.[ch]: fixes for -Wall
	* src/core/iconcache.c: fixes for -Wall
	* src/core/testasyncgetprop.c: fixes for -Wall
	* src/core/xprops.c: fixes for -Wall



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/compositor/compositor-xrender.c
   trunk/src/core/async-getprop.c
   trunk/src/core/async-getprop.h
   trunk/src/core/iconcache.c
   trunk/src/core/testasyncgetprop.c
   trunk/src/core/xprops.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Dec  1 22:54:57 2008
@@ -231,7 +231,7 @@
 
 if test x$have_xcomposite = xyes; then
   METACITY_PC_MODULES="$METACITY_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, , [Building with compositing manager support])
+  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
   echo "Building with compositing manager"
 
   ## force on render also
@@ -487,7 +487,7 @@
 CFLAGS="$CFLAGS -Wall -Werror -ansi"
 
 # Use gnome-doc-utils:
-GNOME_DOC_INIT([0.9.0])
+GNOME_DOC_INIT([0.8.0])
 
 AC_CONFIG_FILES([
 Makefile

Modified: trunk/src/compositor/compositor-xrender.c
==============================================================================
--- trunk/src/compositor/compositor-xrender.c	(original)
+++ trunk/src/compositor/compositor-xrender.c	Mon Dec  1 22:54:57 2008
@@ -26,6 +26,8 @@
 
 #include <config.h>
 
+#ifdef HAVE_COMPOSITE_EXTENSIONS
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -3071,3 +3073,6 @@
   return NULL;
 #endif
 }
+
+#endif /* HAVE_COMPOSITE_EXTENSIONS */
+

Modified: trunk/src/core/async-getprop.c
==============================================================================
--- trunk/src/core/async-getprop.c	(original)
+++ trunk/src/core/async-getprop.c	Mon Dec  1 22:54:57 2008
@@ -586,7 +586,7 @@
                             int                *actual_format,
                             unsigned long      *nitems,
                             unsigned long      *bytesafter,
-                            char              **prop)
+                            unsigned char     **prop)
 {
   Display *dpy;
 
@@ -615,7 +615,7 @@
   *nitems = task->n_items;
   *bytesafter = task->bytes_after;
 
-  *prop = task->data; /* pass out ownership of task->data */
+  *prop = (unsigned char*) task->data; /* pass out ownership of task->data */
 
   SyncHandle ();
 

Modified: trunk/src/core/async-getprop.h
==============================================================================
--- trunk/src/core/async-getprop.h	(original)
+++ trunk/src/core/async-getprop.h	Mon Dec  1 22:54:57 2008
@@ -47,7 +47,7 @@
                                                int                *actual_format,
                                                unsigned long      *nitems,
                                                unsigned long      *bytesafter,
-                                               char              **prop);
+                                               unsigned char     **prop);
 
 Bool     ag_task_have_reply   (AgGetPropertyTask *task);
 Atom     ag_task_get_property (AgGetPropertyTask *task);

Modified: trunk/src/core/iconcache.c
==============================================================================
--- trunk/src/core/iconcache.c	(original)
+++ trunk/src/core/iconcache.c	Mon Dec  1 22:54:57 2008
@@ -225,11 +225,12 @@
   gulong nitems;
   gulong bytes_after;
   int result, err;
-  gulong *data;
+  guchar *data;
   gulong *best;
   int w, h;
   gulong *best_mini;
   int mini_w, mini_h;
+  gulong *data_as_long = (gulong*) data;
 
   meta_error_trap_push_with_return (display);
   type = None;
@@ -239,8 +240,7 @@
                                display->atom__NET_WM_ICON,
 			       0, G_MAXLONG,
 			       False, XA_CARDINAL, &type, &format, &nitems,
-			       &bytes_after, ((guchar **)&data));
-
+			       &bytes_after, &data);
   err = meta_error_trap_pop_with_return (display, TRUE);
 
   if (err != Success ||
@@ -253,7 +253,7 @@
       return FALSE;
     }
 
-  if (!find_best_size (data, nitems,
+  if (!find_best_size (data_as_long, nitems,
                        ideal_width, ideal_height,
                        &w, &h, &best))
     {
@@ -261,7 +261,7 @@
       return FALSE;
     }
 
-  if (!find_best_size (data, nitems,
+  if (!find_best_size (data_as_long, nitems,
                        ideal_mini_width, ideal_mini_height,
                        &mini_w, &mini_h, &best_mini))
     {
@@ -464,7 +464,8 @@
   int format;
   gulong nitems;
   gulong bytes_after;
-  Pixmap *icons;
+  guchar *data;
+  Pixmap *icons = (Pixmap*) icons;
   int err, result;
 
   *pixmap = None;
@@ -478,7 +479,7 @@
 			       False,
                                display->atom__KWM_WIN_ICON,
 			       &type, &format, &nitems,
-			       &bytes_after, (guchar **)&icons);
+			       &bytes_after, &data);
 
   err = meta_error_trap_pop_with_return (display, TRUE);
   if (err != Success ||

Modified: trunk/src/core/testasyncgetprop.c
==============================================================================
--- trunk/src/core/testasyncgetprop.c	(original)
+++ trunk/src/core/testasyncgetprop.c	Mon Dec  1 22:54:57 2008
@@ -187,7 +187,7 @@
       int actual_format;
       unsigned long n_items;
       unsigned long bytes_after;
-      char *data;
+      unsigned char *data;
       char *name;
       struct timeval current_time;
 
@@ -421,7 +421,7 @@
           int actual_format;
           unsigned long n_items;
           unsigned long bytes_after;
-          char *data;
+          unsigned char *data;
 
           assert (ag_task_have_reply (task));
           

Modified: trunk/src/core/xprops.c
==============================================================================
--- trunk/src/core/xprops.c	(original)
+++ trunk/src/core/xprops.c	Mon Dec  1 22:54:57 2008
@@ -199,7 +199,7 @@
                           False, req_type, &results->type, &results->format,
                           &results->n_items,
                           &results->bytes_after,
-                          (guchar **)&results->prop) != Success ||
+                          &results->prop) != Success ||
       results->type == None)
     {
       if (results->prop)
@@ -1051,7 +1051,7 @@
                                       &results.type, &results.format,
                                       &results.n_items,
                                       &results.bytes_after,
-                                      (char **)(&results.prop)) != Success ||
+                                      &results.prop) != Success ||
           results.type == None)
         {
           values[i].type = META_PROP_VALUE_INVALID;