# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1101190665 0
# Node ID a05868a7920e5530bce807d4f0ac3faf54ca799c
# Parent  a66cf83552dc53ae478c59882719e5dc1675d8be
[gaim-migrate @ 11387]
Make GAIM_CONV_ANY work.

committer: Tailor Script <tailor@pidgin.im>

diff -r a66cf83552dc -r a05868a7920e src/conversation.c
--- a/src/conversation.c	Tue Nov 23 06:14:15 2004 +0000
+++ b/src/conversation.c	Tue Nov 23 06:17:45 2004 +0000
@@ -1343,7 +1343,7 @@
 		c = (GaimConversation *)cnv->data;
 		name2 = gaim_normalize(NULL, gaim_conversation_get_name(c));
 
-		if ((type == gaim_conversation_get_type(c)) &&
+		if (((type == GAIM_CONV_ANY) || (type == gaim_conversation_get_type(c))) &&
 				!gaim_utf8_strcasecmp(name1, name2))
 			break;
 
@@ -1373,7 +1373,7 @@
 		c = (GaimConversation *)cnv->data;
 		name2 = gaim_normalize(account, gaim_conversation_get_name(c));
 
-		if ((type == gaim_conversation_get_type(c)) &&
+		if (((type == GAIM_CONV_ANY) || (type == gaim_conversation_get_type(c))) &&
 				(account == gaim_conversation_get_account(c)) &&
 				!gaim_utf8_strcasecmp(name1, name2)) {