comparison pidgin/gtkconv.c @ 32780:b37309823450

Making trunk usable: linkify incoming messages
author tomkiewicz@cpw.pidgin.im
date Sun, 20 May 2012 19:27:17 +0000
parents 2efee7ca90be
children 997570b274d1
comparison
equal deleted inserted replaced
32779:f124ad0022ce 32780:b37309823450
6410 message_html = pidgin_conversation_theme_get_template(gtkconv->theme, 6410 message_html = pidgin_conversation_theme_get_template(gtkconv->theme,
6411 PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS); 6411 PIDGIN_CONVERSATION_THEME_TEMPLATE_STATUS);
6412 } 6412 }
6413 gtkconv->last_flags = flags; 6413 gtkconv->last_flags = flags;
6414 6414
6415 smileyed = smiley_parse_markup(message, purple_account_get_protocol_id(account)); 6415 smileyed = smiley_parse_markup(displaying, purple_account_get_protocol_id(account));
6416 msg = replace_message_tokens(message_html, conv, name, alias, smileyed, flags, mtime); 6416 msg = replace_message_tokens(message_html, conv, name, alias, smileyed, flags, mtime);
6417 escape = gtk_webview_quote_js_string(msg ? msg : ""); 6417 escape = gtk_webview_quote_js_string(msg ? msg : "");
6418 script = g_strdup_printf("%s(%s)", func, escape); 6418 script = g_strdup_printf("%s(%s)", func, escape);
6419 6419
6420 purple_debug_info("webkit", "JS: %s\n", script); 6420 purple_debug_info("webkit", "JS: %s\n", script);