[gtk+] icon-helper: don't warn out when the icon size is GTK_ICON_SIZE_INVALID
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] icon-helper: don't warn out when the icon size is GTK_ICON_SIZE_INVALID
- Date: Wed, 30 Nov 2011 23:33:52 +0000 (UTC)
commit d300ddc5e49f14c42cf9fb1a897899fb65b91da9
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Nov 30 18:32:01 2011 -0500
icon-helper: don't warn out when the icon size is GTK_ICON_SIZE_INVALID
We can call ensure_icon_size() for an empty image; don't warn out in
that case, but just return a zero width.
gtk/gtkiconhelper.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 46724f9..063b7a8 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -128,8 +128,15 @@ ensure_icon_size (GtkIconHelper *self,
self->priv->icon_size,
&width, &height))
{
- g_warning ("Invalid icon size %d\n", self->priv->icon_size);
- width = height = 24;
+ if (self->priv->icon_size == GTK_ICON_SIZE_INVALID)
+ {
+ width = height = 0;
+ }
+ else
+ {
+ g_warning ("Invalid icon size %d\n", self->priv->icon_size);
+ width = height = 24;
+ }
}
*width_out = width;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]