pidgin/pidgin

8f578bc9129b
Making trunk usable: linkify incoming messages
--- 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);