metacity r4049 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Tue Dec  2 08:15:00 2008
New Revision: 4049
URL: http://svn.gnome.org/viewvc/metacity?rev=4049&view=rev

Log:
	* src/core/iconcache.c: patches to fixes for -Wall.  Closes #562939.



Modified:
   trunk/ChangeLog
   trunk/src/core/iconcache.c

Modified: trunk/src/core/iconcache.c
==============================================================================
--- trunk/src/core/iconcache.c	(original)
+++ trunk/src/core/iconcache.c	Tue Dec  2 08:15:00 2008
@@ -230,7 +230,7 @@
   int w, h;
   gulong *best_mini;
   int mini_w, mini_h;
-  gulong *data_as_long = (gulong*) data;
+  gulong *data_as_long;
 
   meta_error_trap_push_with_return (display);
   type = None;
@@ -253,6 +253,8 @@
       return FALSE;
     }
 
+  data_as_long = (gulong *)data;
+
   if (!find_best_size (data_as_long, nitems,
                        ideal_width, ideal_height,
                        &w, &h, &best))
@@ -465,7 +467,7 @@
   gulong nitems;
   gulong bytes_after;
   guchar *data;
-  Pixmap *icons = (Pixmap*) icons;
+  Pixmap *icons;
   int err, result;
 
   *pixmap = None;
@@ -480,6 +482,7 @@
                                display->atom__KWM_WIN_ICON,
 			       &type, &format, &nitems,
 			       &bytes_after, &data);
+  icons = (Pixmap *)data;
 
   err = meta_error_trap_pop_with_return (display, TRUE);
   if (err != Success ||