# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179171486 0
# Node ID 8d7e2cd32a9ac63772d51406478c4e683a97979c
# Parent  dfcca72d86532a565a4d35480fddfa78daf7e510# Parent  9f964a4834d987e5594c88dff03631ecdc1ed90e
merge of '1e134934c8dd6c7af81a819ddaa603fa88f68a36'
     and 'b433c695d45404d43677d106956b9110a4200d08'

diff -r dfcca72d8653 -r 8d7e2cd32a9a COPYRIGHT
--- a/COPYRIGHT	Mon May 14 04:02:56 2007 +0000
+++ b/COPYRIGHT	Mon May 14 19:38:06 2007 +0000
@@ -360,6 +360,7 @@
 James Vega
 David Vermeille
 Sid Vicious
+Jorge Villaseñor (Masca)
 Bjoern Voigt
 Wan Hing Wah
 Philip Walford
diff -r dfcca72d8653 -r 8d7e2cd32a9a pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Mon May 14 04:02:56 2007 +0000
+++ b/pidgin/gtkimhtml.c	Mon May 14 19:38:06 2007 +0000
@@ -3388,7 +3388,7 @@
 		return FALSE;
 
 	pix = gdk_pixbuf_animation_get_static_image(anim);
-	image = gtk_imhtml_image_new(pix, NULL, 0);
+	image = gtk_imhtml_image_new(pix, smiley->smile, 0);
 	ret = gtk_imhtml_image_clicked(w, event, (GtkIMHtmlImage*)image);
 	g_object_set_data_full(G_OBJECT(w), "image-data", image, (GDestroyNotify)gtk_imhtml_image_free);
 	g_object_unref(G_OBJECT(pix));