soc.2012.gg: 7e7ded95: Making trunk usable: linkify incoming me...

[tomkiewicz at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: 7e7ded95fce2925f90c076c274edad16084b5032
Parent:   720d0db07edbddea10a65b20f03956e5f25033a6
Author:   tomkiewicz at cpw.pidgin.im
Date:     05/20/12 15:27:17
Branch:   im.pidgin.soc.2012.gg
URL: http://d.pidgin.im/viewmtn/revision/info/7e7ded95fce2925f90c076c274edad16084b5032

Changelog: 

Making trunk usable: linkify incoming messages

Changes against parent 720d0db07edbddea10a65b20f03956e5f25033a6

  patched  pidgin/gtkconv.c

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	f775baf0cb5998d792944cf0090b27300d78d40d
+++ pidgin/gtkconv.c	e540985f885b76b47743fa43c1dea2e387844239
@@ -6412,7 +6412,7 @@ pidgin_conv_write_conv(PurpleConversatio
 	}
 	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);