# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1181940749 0
# Node ID d865909b664699ad0f193c44356d06e02809af09
# Parent  40d51793f2d74cb431dc956945b99c88ae9fc752# Parent  474283509a2aeea7e5344059330779ccbf0379d2
merge of '2fd78f054c148084b54507e046c3cf02826636f5'
     and '9c6851a63e0bbc1f138f02a0b71623ef2a1020b2'

diff -r 40d51793f2d7 -r d865909b6646 pidgin/gtkdocklet-x11.c
--- 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();
 }