Mercurial > pidgin
diff gtk/gtkutils.c @ 15239:30932055bb7c
[gaim-migrate @ 18029]
A better fix for the bugs I introduced in revision 18012, that was
partially fixed by sf patch #1618871.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 20 Dec 2006 09:31:11 +0000 |
| parents | a5ef8fc9fbeb |
| children | 7ce73985115a |
line wrap: on
line diff
--- a/gtk/gtkutils.c Wed Dec 20 09:28:29 2006 +0000 +++ b/gtk/gtkutils.c Wed Dec 20 09:31:11 2006 +0000 @@ -1525,11 +1525,14 @@ g_list_free(files); } -void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, int *width, int *height) +void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height) { *width = gdk_pixbuf_get_width(buf); *height = gdk_pixbuf_get_height(buf); + if ((spec == NULL) || !(spec->scale_rules & rules)) + return; + gaim_buddy_icon_get_scale_size(spec, width, height); /* and now for some arbitrary sanity checks */