Mercurial > pidgin
changeset 21486:c8cdf0bcc8e3
merge of '45b552be25717e53a4c0e84b9d0242ded9c05628'
and '534c96a5976cb55b46a727cf2bee87140137b1e9'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 14 Nov 2007 00:23:21 +0000 |
| parents | b95a421c9980 (diff) a4860971f861 (current diff) |
| children | f2e42e09e635 277873603719 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkdocklet-x11.c Wed Nov 14 00:09:06 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Wed Nov 14 00:23:21 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(); }