# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170792876 0
# Node ID 9453125dd44e3df1be7681a9da2bae4fd563b19e
# Parent  9795470ed79480123d1dc173f8d115b03c5233b1# Parent  3ae0ba9aee4675989263998084f571b278983088
merge of '775b7904558492c380903ec245b6f172ac850039'
     and 'e0d022e81398f58548aea9e9af2631dabfd22f86'

diff -r 3ae0ba9aee46 -r 9453125dd44e libpurple/server.c
--- a/libpurple/server.c	Tue Feb 06 20:14:31 2007 +0000
+++ b/libpurple/server.c	Tue Feb 06 20:14:36 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);
 }
 
diff -r 3ae0ba9aee46 -r 9453125dd44e pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Feb 06 20:14:31 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Feb 06 20:14:36 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"),