# HG changeset patch
# User tomkiewicz@cpw.pidgin.im
# Date 1337542037 0
# Node ID b37309823450fdd504d966bb80848a0cca3593de
# Parent  f124ad0022cea3ec58d4c1bc2d64d9190dde4883
Making trunk usable: linkify incoming messages

diff -r f124ad0022ce -r b37309823450 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sun May 20 19:08:37 2012 +0000
+++ b/pidgin/gtkconv.c	Sun May 20 19:27:17 2012 +0000
@@ -6412,7 +6412,7 @@
 	}
 	gtkconv->last_flags = flags;
 
-	smileyed = smiley_parse_markup(message, purple_account_get_protocol_id(account));
+	smileyed = smiley_parse_markup(displaying, purple_account_get_protocol_id(account));
 	msg = replace_message_tokens(message_html, conv, name, alias, smileyed, flags, mtime);
 	escape = gtk_webview_quote_js_string(msg ? msg : "");
 	script = g_strdup_printf("%s(%s)", func, escape);