[Gaim-commits] CVS: gaim/src gtkaccount.c,1.157,1.158

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31090

Modified Files:
	gtkaccount.c 
Log Message:
sf patch #1089195, from Graham Cole
Only attempt to scale buddy icons if we actually need to.  This should
avoid some needless blurring of icons that are already the correct size.


Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -p -r1.157 -r1.158
--- gtkaccount.c	24 Dec 2004 00:05:35 -0000	1.157
+++ gtkaccount.c	24 Dec 2004 01:32:12 -0000	1.158
@@ -546,7 +546,12 @@ convert_buddy_icon(GaimPlugin *plugin, c
 		const char *dirname = gaim_buddy_icons_get_cache_dir();
 		char *filename = g_build_filename(dirname, random, NULL);
 		pixbuf = gdk_pixbuf_new_from_file(path, &error);
-		if (!error && prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_SEND) {
+		if (!error && (prpl_info->icon_spec.scale_rules & GAIM_ICON_SCALE_SEND) &&
+			(width <= prpl_info->icon_spec.min_width ||
+			 width >= prpl_info->icon_spec.max_width ||
+			 height <= prpl_info->icon_spec.min_height ||
+			 height >= prpl_info->icon_spec.max_height))
+		{
 			int new_width = gdk_pixbuf_get_width(pixbuf);
 			int new_height = gdk_pixbuf_get_height(pixbuf);