changeset 21481:84489b5529a7

merge of 'e9c1dfdac7b1652f8c03584db667bc586c4b295c' and 'f2ac3f0cdea64fd5e603c5350cabf85ed619f5e3'
author Casey Harkins <charkins@pidgin.im>
date Tue, 13 Nov 2007 22:45:51 +0000
parents 8fc43ef9d6a2 (current diff) f16534ec2897 (diff)
children e241c6cdce85 a4860971f861 b95a421c9980
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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();
 }