# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1166593849 0
# Node ID 658f815e2b5829649774a149294e43a3b606c0c4
# Parent  2bcb8684bfb5600877c5675edaff86525bca28d0
[gaim-migrate @ 18027]
This fixes a bug I was hitting, that datallah mentioned was assigned to him (1618871).

Datallah, feel free to close that bug..

committer: Tailor Script <tailor@pidgin.im>

diff -r 2bcb8684bfb5 -r 658f815e2b58 gtk/gtkconv.c
--- a/gtk/gtkconv.c	Wed Dec 20 05:43:51 2006 +0000
+++ b/gtk/gtkconv.c	Wed Dec 20 05:50:49 2006 +0000
@@ -6070,9 +6070,14 @@
 			start_anim(NULL, gtkconv);
 	}
 
-	if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY)
+	if (prpl_info && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_DISPLAY) {
 		gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
 			&scale_width, &scale_height);
+	} else {
+		scale_width = gdk_pixbuf_get_width(buf);
+		scale_height = gdk_pixbuf_get_height(buf);
+	}
+
 	scale = gdk_pixbuf_scale_simple(buf,
 				MAX(gdk_pixbuf_get_width(buf) * scale_width /
 				    gdk_pixbuf_animation_get_width(gtkconv->u.im->anim), 1),