Mercurial > pidgin.yaz
changeset 10247:a05868a7920e
[gaim-migrate @ 11387]
Make GAIM_CONV_ANY work.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 23 Nov 2004 06:17:45 +0000 |
parents | a66cf83552dc |
children | e7c0a9e0c276 |
files | src/conversation.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)) {