diff src/conversation.c @ 5136:381da05cb5ed

[gaim-migrate @ 5500] this started out as simply adding an option to right-click on a jabber buddy and re-request authorization. Then I ended up chasing the disgusting mess of const vs non-const parameters all over gaim. The end result is that you can now right-click on jabber buddies and re-request auth like you can for ICQ. Also, a lot more things are const that should be, I fixed a bug or two, and I cleaned up one of my least favorite functions in gaim (linkify_text). It is now decidedly less evil. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Tue, 15 Apr 2003 04:18:00 +0000
parents bfcf72c5a930
children d0182ae31ab8
line wrap: on
line diff
--- a/src/conversation.c	Tue Apr 15 03:45:31 2003 +0000
+++ b/src/conversation.c	Tue Apr 15 04:18:00 2003 +0000
@@ -175,7 +175,7 @@
 	GaimConversationType type;
 	struct gaim_connection *gc;
 	struct gaim_conversation_ui_ops *ops;
-	char *buf, *buf2, *buffy;
+	char *buf, *buf2, *buffy = NULL;
 	gulong length = 0;
 	gboolean binary = FALSE;
 	int plugin_return;
@@ -212,12 +212,11 @@
 
 	buf2 = g_malloc(limit);
 
-	if (gc->flags & OPT_CONN_HTML) {
-		if (convo_options & OPT_CONVO_SEND_LINKS)
-			linkify_text(buf);
-	}
-
-	buffy = g_strdup(buf);
+	if (gc->flags & OPT_CONN_HTML && convo_options & OPT_CONVO_SEND_LINKS)
+		buffy =linkify_text(buf);
+	else
+		buffy = g_strdup(buf);
+
 	plugin_return = plugin_event(
 			(type == GAIM_CONV_IM ? event_im_send : event_chat_send),
 			gc,