[Gaim-commits] SF.net SVN: gaim: [18027] trunk/gtk/gtkconv.c

[<amc...@us...>]

Revision: 18027
          http://svn.sourceforge.net/gaim/?rev=18027&view=rev
Author:   amc_grim
Date:     2006-12-19 21:50:49 -0800 (Tue, 19 Dec 2006)

Log Message:
-----------
This fixes a bug I was hitting, that datallah mentioned was assigned to him (1618871).

Datallah, feel free to close that bug..

Modified Paths:
--------------
    trunk/gtk/gtkconv.c

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-12-20 05:43:51 UTC (rev 18026)
+++ trunk/gtk/gtkconv.c	2006-12-20 05:50:49 UTC (rev 18027)
@@ -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),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.