Mercurial > pidgin.yaz

changeset 10806:58c84363c8ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12455] Fix MSN multi user chats committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 10 Apr 2005 16:49:05 +0000
parents 4151d16f6348
children 904aafb6713d
files src/protocols/msn/switchboard.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/switchboard.c	Sun Apr 10 02:22:15 2005 +0000
+++ b/src/protocols/msn/switchboard.c	Sun Apr 10 16:49:05 2005 +0000
@@ -226,12 +226,10 @@
 					swboard->current_users);
 #endif
 
-	if (!(swboard->flag & MSN_SB_FLAG_IM))
+	if (!(swboard->flag & MSN_SB_FLAG_IM) && (swboard->conv != NULL))
 	{
 		/* This is a helper switchboard. */
-		if (swboard->conv != NULL)
-			gaim_debug_error("msn", "switchboard_add_user: conv != NULL\n");
-
+		gaim_debug_error("msn", "switchboard_add_user: conv != NULL\n");
 		return;
 	}
 
@@ -261,7 +259,7 @@
 
 			cmdproc->session->conv_seq++;
 			swboard->chat_id = cmdproc->session->conv_seq;
-
+			swboard->flag |= MSN_SB_FLAG_IM;
 			swboard->conv = serv_got_joined_chat(account->gc,
 												 swboard->chat_id,
 												 "MSN Chat");