diff src/protocols/oscar/oscar.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/protocols/oscar/oscar.c	Thu Jan 30 18:38:34 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Jan 30 18:45:50 2003 +0000
@@ -1510,7 +1510,7 @@
 	dim->conn->fd = source;
 	aim_conn_completeconnect(od->sess, dim->conn);
 	if (!(cnv = gaim_find_conversation(dim->name))) 
-		cnv = gaim_conversation_new(GAIM_CONV_IM, dim->name);
+		cnv = gaim_conversation_new(GAIM_CONV_IM, dim->gc->user, dim->name);
 
 	/* This is the best way to see if we're connected or not */
 	if (getpeername(source, &name, &name_len) == 0) {
@@ -4758,7 +4758,7 @@
 	dim = find_direct_im(od, sn);
 
 	if (!(cnv = gaim_find_conversation(sn)))
-		cnv = gaim_conversation_new(GAIM_CONV_IM, sn);
+		cnv = gaim_conversation_new(GAIM_CONV_IM, dim->gc->user, sn);
 	gaim_input_remove(dim->watcher);
 	dim->conn = newconn;
 	dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,