Mercurial > pidgin
changeset 17077:8d7e2cd32a9a
merge of '1e134934c8dd6c7af81a819ddaa603fa88f68a36'
and 'b433c695d45404d43677d106956b9110a4200d08'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 14 May 2007 19:38:06 +0000 |
| parents | dfcca72d8653 (current diff) 9f964a4834d9 (diff) |
| children | 4453f59c2035 6f3432091d4b |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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));