# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1194993951 0
# Node ID 84489b5529a7a6ba9d94da6413b2cfea670a33a9
# Parent  8fc43ef9d6a2fbf0bb0d4b1e36827c1b945ffc01# Parent  f16534ec2897e80b57f557bbafdf1165722b3389
merge of 'e9c1dfdac7b1652f8c03584db667bc586c4b295c'
     and 'f2ac3f0cdea64fd5e603c5350cabf85ed619f5e3'

diff -r 8fc43ef9d6a2 -r 84489b5529a7 pidgin/gtkdocklet-x11.c
--- a/pidgin/gtkdocklet-x11.c	Tue Nov 13 22:36:10 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Tue Nov 13 22:45:51 2007 +0000
@@ -139,9 +139,9 @@
 static void
 docklet_x11_resize_icon(GtkWidget *widget)
 {
-	if (docklet_height == MIN(widget->allocation.height, widget->allocation.width))
+	if (docklet_height == widget->allocation.height)
 		return;
-	docklet_height = MIN(widget->allocation.height, widget->allocation.width);
+	docklet_height = widget->allocation.height;
 	pidgin_docklet_update_icon();
 }