Mercurial > pidgin
changeset 18107:d865909b6646
merge of '2fd78f054c148084b54507e046c3cf02826636f5'
and '9c6851a63e0bbc1f138f02a0b71623ef2a1020b2'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2007 20:52:29 +0000 |
| parents | 40d51793f2d7 (current diff) 474283509a2a (diff) |
| children | c0cd4d84ba52 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkdocklet-x11.c Fri Jun 15 19:34:24 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Fri Jun 15 20:52:29 2007 +0000 @@ -139,9 +139,9 @@ static void docklet_x11_resize_icon(GtkWidget *widget) { - if (docklet_height == widget->allocation.height) + if (docklet_height == MIN(widget->allocation.height, widget->allocation.width)) return; - docklet_height = widget->allocation.height; + docklet_height = MIN(widget->allocation.height, widget->allocation.width); pidgin_docklet_update_icon(); }