diff src/server.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 <[e-mail]>

--- a/src/server.c	Thu Jan 30 18:38:34 2003 +0000
+++ b/src/server.c	Thu Jan 30 18:45:50 2003 +0000
@@ -733,10 +733,8 @@
 			 * the receive sound (sound.c will take care of not playing
 			 * while away), and then write it to the convo window.
 			 */
-			if (cnv == NULL) {
-				cnv = gaim_conversation_new(GAIM_CONV_IM, name);
-				gaim_conversation_set_user(cnv, gc->user);
-			}
+			if (cnv == NULL)
+				cnv = gaim_conversation_new(GAIM_CONV_IM, gc->user, name);
 
 			gaim_im_write(GAIM_IM(cnv), NULL, message, len,
 						  away | WFLAG_RECV, mtime);
@@ -827,10 +825,8 @@
 			qm->len = len;
 			unread_message_queue = g_slist_append(unread_message_queue, qm);
 		} else {
-			if (cnv == NULL) {
-				cnv = gaim_conversation_new(GAIM_CONV_IM, name);
-				gaim_conversation_set_user(cnv, gc->user);
-			}
+			if (cnv == NULL)
+				cnv = gaim_conversation_new(GAIM_CONV_IM, gc->user, name);
 
 			/* CONV XXX gaim_conversation_set_name(cnv, name); */
 
@@ -1078,14 +1074,13 @@
 	struct gaim_conversation *b;
 	struct gaim_chat *chat;
 
-	b = gaim_conversation_new(GAIM_CONV_CHAT, name);
+	b = gaim_conversation_new(GAIM_CONV_CHAT, gc->user, name);
 	chat = GAIM_CHAT(b);
 
 	gc->buddy_chats = g_slist_append(gc->buddy_chats, b);
 
 	gaim_chat_set_id(chat, id);
-	gaim_conversation_set_user(b, gc->user);
-	
+
 	if ((logging_options & OPT_LOG_CHATS) ||
 		find_log_info(gaim_conversation_get_name(b))) {