diff src/gtkconv.c @ 6640:314111e7b601

[gaim-migrate @ 7165] Changed several calls from gaim_find_conversation() to gaim_find_conversation_with_account(). committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Wed Aug 27 23:03:03 2003 +0000
+++ b/src/gtkconv.c	Thu Aug 28 01:18:50 2003 +0000
@@ -878,12 +878,10 @@
 
 	account = gaim_conversation_get_account(conv);
 
-	conv2 = gaim_find_conversation(name);
-
-	if (conv2 != NULL) {
+	conv2 = gaim_find_conversation_with_account(name, account);
+
+	if (conv2 != NULL)
 		gaim_window_raise(gaim_conversation_get_window(conv2));
-		gaim_conversation_set_account(conv2, account);
-	}
 	else
 		conv2 = gaim_conversation_new(GAIM_CONV_IM, account, name);
 }
@@ -935,7 +933,7 @@
 
 	account = gaim_conversation_get_account(conv);
 
-	conv2 = gaim_find_conversation(who);
+	conv2 = gaim_find_conversation_with_account(who, account);
 
 	if (conv2 != NULL)
 		gaim_window_show(gaim_conversation_get_window(conv2));
@@ -1053,7 +1051,7 @@
 	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
 		GaimConversation *c;
 
-		if ((c = gaim_find_conversation(who)) == NULL)
+		if ((c = gaim_find_conversation_with_account(who, account)) == NULL)
 			c = gaim_conversation_new(GAIM_CONV_IM, account, who);
 		else
 			gaim_conversation_set_account(c, account);