diff src/protocols/irc/irc.c @ 4476:62c1e5e656d0

[gaim-migrate @ 4751] gaim_conversation_new() now takes an aim_user parameter. This should fix the new placement grouping bugs, as the default "user" (account) selected was the first account in the list of connections. There may be side-effects, especially with perl plugins, but I'm not sure. Please report anything odd that you see as a result of this. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 30 Jan 2003 18:45:50 +0000
parents 1630b1dca931
children 3196d9044a45
line wrap: on
line diff
--- a/src/protocols/irc/irc.c	Thu Jan 30 18:38:34 2003 +0000
+++ b/src/protocols/irc/irc.c	Thu Jan 30 18:45:50 2003 +0000
@@ -505,7 +505,8 @@
 	else	{
 		g_snprintf (buf, sizeof buf, _("DCC Chat with %s closed"),
 			    chat->nick);
-		convo = gaim_conversation_new(GAIM_CONV_IM, chat->nick);
+		convo = gaim_conversation_new(GAIM_CONV_IM, chat->gc->user,
+									  chat->nick);
 		gaim_conversation_write(convo, NULL, buf, -1, WFLAG_SYSTEM,
 								time(NULL));
 		dcc_chat_cancel (chat);
@@ -567,7 +568,7 @@
 	struct gaim_conversation *convo;
 	char buf[IRC_BUF_LEN];
 
-	convo = gaim_conversation_new(GAIM_CONV_IM, chat->nick);
+	convo = gaim_conversation_new(GAIM_CONV_IM, chat->gc->user, chat->nick);
 
 	chat->fd = source;
 	g_snprintf (buf, sizeof buf,
@@ -2377,7 +2378,8 @@
 	chat->fd = accept (chat->fd, (struct sockaddr *) (&addr), &addrlen);
 	if (!chat->fd) {
 		dcc_chat_cancel (chat);
-		convo = gaim_conversation_new(GAIM_CONV_IM, chat->nick);
+		convo = gaim_conversation_new(GAIM_CONV_IM, chat->gc->user,
+									  chat->nick);
 		g_snprintf (buf, sizeof buf, _("DCC Chat with %s closed"),
 			    chat->nick);
 		gaim_conversation_write(convo, NULL, buf, -1,
@@ -2386,7 +2388,7 @@
 	}
 	chat->inpa =
 		gaim_input_add (chat->fd, GAIM_INPUT_READ, dcc_chat_in, chat);
-	convo = gaim_conversation_new(GAIM_CONV_IM, chat->nick);
+	convo = gaim_conversation_new(GAIM_CONV_IM, chat->gc->user, chat->nick);
 	g_snprintf (buf, sizeof buf, _("DCC Chat with %s established"),
 				chat->nick);
 	gaim_conversation_write(convo, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));