# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1252352017 0
# Node ID f200f76289626e385767ca2c347bc0fb99807823
# Parent  c51f00627af49d8f5cc3bdf88165f9ccb305421b# Parent  a6cfb7bf8c881934d7ad2f5c09b3c4aec9aaa7cb
merge of '37aa00d044431100d37466517568640cb082680c'
     and '7fb07587f5c87cbf108267d40521da8e2ec4d6fd'

diff -r c51f00627af4 -r f200f7628962 pidgin/gtksmiley.c
--- a/pidgin/gtksmiley.c	Mon Sep 07 18:28:28 2009 +0000
+++ b/pidgin/gtksmiley.c	Mon Sep 07 19:33:37 2009 +0000
@@ -601,10 +601,17 @@
 		GdkPixbuf *smiley_image = pidgin_pixbuf_from_imgstore(img);
 		purple_imgstore_unref(img);
 
-		if (smiley_image != NULL)
-			sized_smiley = gdk_pixbuf_scale_simple(smiley_image,
+		if (smiley_image != NULL) {
+			if (gdk_pixbuf_get_width(smiley_image) > 22 ||
+				gdk_pixbuf_get_height(smiley_image) > 22) {
+				sized_smiley = gdk_pixbuf_scale_simple(smiley_image,
 					22, 22, GDK_INTERP_HYPER);
-		g_object_unref(G_OBJECT(smiley_image));
+				g_object_unref(G_OBJECT(smiley_image));
+			} else {
+				/* don't scale up smaller smileys, avoid blurryness */
+				sized_smiley = smiley_image;
+			}
+		}
 	}