Mercurial > pidgin.yaz
changeset 15580:9795470ed794
merge of '4ef29c4e2bea9c0635008afc35f12402d7a87bbf'
and 'd5bb9dcc414df1c34df4a2d22d3ff5fb98673675'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 06 Feb 2007 19:23:19 +0000 |
| parents | a7b4a4c2cfcf (current diff) 74b945e7609c (diff) |
| children | 9453125dd44e 2c33e35a5084 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/server.c Mon Feb 05 22:16:35 2007 +0000 +++ b/libpurple/server.c Tue Feb 06 19:23:19 2007 +0000 @@ -473,11 +473,6 @@ if (cnv == NULL) cnv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, gc->account); - /* Make sure URLs are clickable */ - buffy = gaim_markup_linkify(message); - g_free(message); - message = buffy; - /* * XXX: Should we be setting this here, or relying on prpls to set it? */ @@ -749,7 +744,6 @@ GSList *bcs; GaimConversation *conv = NULL; GaimConvChat *chat = NULL; - char *buf; char *buffy, *angel; int plugin_return; @@ -798,13 +792,9 @@ gaim_signal_emit(gaim_conversations_get_handle(), "received-chat-msg", g->account, who, message, conv, flags); - /* Make sure URLs are clickable */ - buf = gaim_markup_linkify(message); - - gaim_conv_chat_write(chat, who, buf, flags, mtime); + gaim_conv_chat_write(chat, who, message, flags, mtime); g_free(angel); - g_free(buf); g_free(buffy); }
--- a/pidgin/gtkconv.c Mon Feb 05 22:16:35 2007 +0000 +++ b/pidgin/gtkconv.c Tue Feb 06 19:23:19 2007 +0000 @@ -4825,7 +4825,8 @@ gc = gaim_account_get_connection(account); g_return_if_fail(gc != NULL); - displaying = g_strdup(message); + /* Make sure URLs are clickable */ + displaying = gaim_markup_linkify(message); plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1( pidgin_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ? "displaying-im-msg" : "displaying-chat-msg"),