callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

icon-helper: don't warn out when the icon size is GTK_ICON_SIZE_INVALID

Browse Source 
We can call ensure_icon_size() for an empty image; don't warn out in
that case, but just return a zero width.
This commit is contained in:
Cosimo Cecchi 2011-11-30 18:32:01 -05:00
parent e37c55aa3e
commit d300ddc5e4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkiconhelper.c
View File

@ -127,10 +127,17 @@ ensure_icon_size (GtkIconHelper *self,
else if (!gtk_icon_size_lookup_for_settings (settings, else if (!gtk_icon_size_lookup_for_settings (settings,
self->priv->icon_size, self->priv->icon_size,
&width, &height)) &width, &height))
{
if (self->priv->icon_size == GTK_ICON_SIZE_INVALID)
{
width = height = 0;
}
else
{ {
g_warning ("Invalid icon size %d\n", self->priv->icon_size); g_warning ("Invalid icon size %d\n", self->priv->icon_size);
width = height = 24; width = height = 24;
} }
}
*width_out = width; *width_out = width;
*height_out = height; *height_out = height;