brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

patches to fixes for -Wall. Closes #562939.

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


svn path=/trunk/; revision=4049
This commit is contained in:
Thomas James Alexander Thurman 2008-12-02 08:15:00 +00:00
parent e7a69b6a13
commit 45f2ec5f64
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-12-02 Matt Kraai <kraai@ftbfs.org>
* src/core/iconcache.c: patches to fixes for -Wall. Closes #562939.
2008-12-01 Thomas Thurman <tthurman@gnome.org> 2008-12-01 Thomas Thurman <tthurman@gnome.org>
* configure.in: Post-release bump to 2.25.34. * configure.in: Post-release bump to 2.25.34.

7
src/core/iconcache.c
View File

@ -230,7 +230,7 @@ read_rgb_icon (MetaDisplay *display,
int w, h; int w, h;
gulong *best_mini; gulong *best_mini;
int mini_w, mini_h; int mini_w, mini_h;
gulong *data_as_long = (gulong*) data; gulong *data_as_long;
meta_error_trap_push_with_return (display); meta_error_trap_push_with_return (display);
type = None; type = None;
@ -253,6 +253,8 @@ read_rgb_icon (MetaDisplay *display,
return FALSE; return FALSE;
} }
data_as_long = (gulong *)data;
if (!find_best_size (data_as_long, nitems, if (!find_best_size (data_as_long, nitems,
ideal_width, ideal_height, ideal_width, ideal_height,
&w, &h, &best)) &w, &h, &best))
@ -465,7 +467,7 @@ get_kwm_win_icon (MetaDisplay *display,
gulong nitems; gulong nitems;
gulong bytes_after; gulong bytes_after;
guchar *data; guchar *data;
Pixmap *icons = (Pixmap*) icons; Pixmap *icons;
int err, result; int err, result;
*pixmap = None; *pixmap = None;
@ -480,6 +482,7 @@ get_kwm_win_icon (MetaDisplay *display,
display->atom__KWM_WIN_ICON, display->atom__KWM_WIN_ICON,
&type, &format, &nitems, &type, &format, &nitems,
&bytes_after, &data); &bytes_after, &data);
icons = (Pixmap *)data;
err = meta_error_trap_pop_with_return (display, TRUE); err = meta_error_trap_pop_with_return (display, TRUE);
if (err != Success || if (err != Success ||