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

fix a third warning about %d and long int

Browse Source 
2007-12-19  Havoc Pennington  <hp@redhat.com>

	* src/core/display.c (meta_display_open): fix a third warning
	about %d and long int

	* src/core/delete.c (io_from_ping_dialog): fix another warning
	about long int to %d

	* src/core/compositor.c (meta_compositor_new): fix a warning about
	long int to %d

	* src/core/iconcache.c (meta_read_icons): use
	meta_ui_get_fallback_icons() instead of incorrectly including theme.h

	* src/ui/ui.c (meta_ui_get_fallback_icons): new function


svn path=/trunk/; revision=3492
This commit is contained in:
Havoc Pennington 2007-12-19 21:38:15 +00:00 committed by Havoc Pennington
parent 72b08c82b1
commit b718f79c47
7 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2007-12-19 Havoc Pennington <hp@redhat.com>
* src/core/display.c (meta_display_open): fix a third warning
about %d and long int
* src/core/delete.c (io_from_ping_dialog): fix another warning
about long int to %d
* src/core/compositor.c (meta_compositor_new): fix a warning about
long int to %d
* src/core/iconcache.c (meta_read_icons): use
meta_ui_get_fallback_icons() instead of incorrectly including theme.h
* src/ui/ui.c (meta_ui_get_fallback_icons): new function
2007-12-19 Havoc Pennington <hp@redhat.com> 2007-12-19 Havoc Pennington <hp@redhat.com>
* src/ui, src/core, src/include: sort source files into these * src/ui, src/core, src/include: sort source files into these

2
src/core/compositor.c
View File

@ -2216,7 +2216,7 @@ meta_compositor_new (MetaDisplay *display)
compositor = g_new (MetaCompositor, 1); compositor = g_new (MetaCompositor, 1);
compositor->display = display; compositor->display = display;
meta_verbose ("Creating %d atoms\n", G_N_ELEMENTS (atom_names)); meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
XInternAtoms (display->xdisplay, atom_names, G_N_ELEMENTS (atom_names), XInternAtoms (display->xdisplay, atom_names, G_N_ELEMENTS (atom_names),
False, atoms); False, atoms);
compositor->atom_x_root_pixmap = atoms[0]; compositor->atom_x_root_pixmap = atoms[0];

2
src/core/delete.c
View File

@ -271,7 +271,7 @@ io_from_ping_dialog (GIOChannel *channel,
meta_topic (META_DEBUG_PING, meta_topic (META_DEBUG_PING,
"Read %d bytes strlen %d \"%s\" from child\n", "Read %d bytes strlen %d \"%s\" from child\n",
len, str ? strlen (str) : 0, str ? str : "NULL"); len, str ? (int) strlen (str) : 0, str ? str : "NULL");
if (len > 0) if (len > 0)
{ {

2
src/core/display.c
View File

@ -418,7 +418,7 @@ meta_display_open (void)
meta_prefs_add_listener (prefs_changed_callback, display); meta_prefs_add_listener (prefs_changed_callback, display);
meta_verbose ("Creating %d atoms\n", G_N_ELEMENTS (atom_names)); meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
XInternAtoms (display->xdisplay, atom_names, G_N_ELEMENTS (atom_names), XInternAtoms (display->xdisplay, atom_names, G_N_ELEMENTS (atom_names),
False, atoms); False, atoms);
display->atom_net_wm_name = atoms[0]; display->atom_net_wm_name = atoms[0];

27
src/core/iconcache.c
View File

@ -817,11 +817,15 @@ meta_read_icons (MetaScreen *screen,
if (icon_cache->want_fallback && if (icon_cache->want_fallback &&
icon_cache->origin < USING_FALLBACK_ICON) icon_cache->origin < USING_FALLBACK_ICON)
{ {
#if 0 GdkPixbuf *fallback_icon;
/* FIXME this code requires GTK and thus does not belong here in core/ */ GdkPixbuf *fallback_mini_icon;
MetaTheme *theme = meta_theme_get_current ();
fallback_icon = NULL;
fallback_mini_icon = NULL;
if (theme->fallback_icon == NULL || theme->fallback_mini_icon == NULL) meta_ui_get_fallback_icons(&fallback_icon, &fallback_mini_icon);
if (fallback_icon == NULL || fallback_mini_icon == NULL)
{ {
get_fallback_icons (screen, get_fallback_icons (screen,
iconp, iconp,
@ -832,18 +836,15 @@ meta_read_icons (MetaScreen *screen,
ideal_mini_height); ideal_mini_height);
} }
if (theme->fallback_icon != NULL) if (fallback_icon != NULL)
*iconp = theme->fallback_icon; *iconp = fallback_icon;
if (theme->fallback_mini_icon != NULL) if (fallback_mini_icon != NULL)
*mini_iconp = theme->fallback_mini_icon; *mini_iconp = fallback_mini_icon;
replace_cache (icon_cache, USING_FALLBACK_ICON, replace_cache (icon_cache, USING_FALLBACK_ICON,
*iconp, *mini_iconp); *iconp, *mini_iconp);
return TRUE; return TRUE;
#else
return FALSE;
#endif
} }
if (!icon_cache->want_fallback && if (!icon_cache->want_fallback &&

3
src/include/ui.h
View File

@ -204,6 +204,9 @@ MetaUIDirection meta_ui_get_direction (void);
GdkPixbuf *meta_ui_get_pixbuf_from_pixmap (Pixmap pmap); GdkPixbuf *meta_ui_get_pixbuf_from_pixmap (Pixmap pmap);
void meta_ui_get_fallback_icons (GdkPixbuf **fallback_icon_p,
GdkPixbuf **fallback_mini_icon_p);
#include "tabpopup.h" #include "tabpopup.h"
#endif #endif

14
src/ui/ui.c
View File

@ -988,6 +988,16 @@ meta_ui_get_pixbuf_from_pixmap (Pixmap pmap)
return pixbuf; return pixbuf;
} }
void
meta_ui_get_fallback_icons (GdkPixbuf **fallback_icon_p,
GdkPixbuf **fallback_mini_icon_p)
{
MetaTheme *theme = meta_theme_get_current ();
if (fallback_icon_p)
*fallback_icon_p = theme->fallback_icon;
if (fallback_mini_icon_p)
*fallback_mini_icon_p = theme->fallback_mini_icon;
}