Mercurial > pidgin
changeset 17413:55ded28f6640
merge of 'a07c6d482eb3c45f4ce691c86eb09a2a79786cd9'
and 'ca9398713c48d4c1ba22fe3b6844d0cd1f6b40eb'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Thu, 31 May 2007 20:24:27 +0000 |
| parents | e7595d13fd63 (diff) b23999491c64 (current diff) |
| children | 42444b7071d3 98dd7d5b646a |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkstatusbox.c Thu May 31 18:28:09 2007 +0000 +++ b/pidgin/gtkstatusbox.c Thu May 31 20:24:27 2007 +0000 @@ -2029,6 +2029,10 @@ int w, h; GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_MEDIUM); gtk_icon_size_lookup(icon_size, &w, &h); + if (height > width) + w = width * h / height; + else if (width > height) + h = height * w / width; gdk_pixbuf_loader_set_size(loader, w, h); #endif }