Mercurial > pidgin3 / changeset

--- a/src/protocols/msn/msn.c	Sat Jul 05 07:01:42 2003 +0000
+++ b/src/protocols/msn/msn.c	Sat Jul 05 07:16:22 2003 +0000
@@ -1101,10 +1101,10 @@
 	GaimAccount *account = gaim_connection_get_account(gc);
 	MsnSession *session = gc->proto_data;
 	MsnSwitchBoard *swboard;
-	
+
 	swboard = msn_session_find_switch_with_passport(session, who);
 
-	if (swboard != NULL) {
+	if (swboard != NULL && swboard->chat == NULL) {
 		char sendbuf[256];
 
 		g_snprintf(sendbuf, sizeof(sendbuf), "BYE %s\r\n",

--- a/src/protocols/msn/switchboard.c	Sat Jul 05 07:01:42 2003 +0000
+++ b/src/protocols/msn/switchboard.c	Sat Jul 05 07:16:22 2003 +0000
@@ -164,11 +164,17 @@
 
 	if (swboard->total_users > 1) {
 		if (swboard->chat == NULL) {
+			GaimConversation *conv;
+
+			conv = gaim_find_conversation(msn_user_get_passport(swboard->user));
+
 			swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
 												 "MSN Chat");
 
 			gaim_chat_add_user(GAIM_CHAT(swboard->chat),
 							   gaim_account_get_username(account), NULL);
+
+			gaim_conversation_destroy(conv);
 		}
 
 		gaim_chat_add_user(GAIM_CHAT(swboard->chat), params[3], NULL);
@@ -189,6 +195,10 @@
 	passport = params[0];
 
 	if (swboard->total_users == 1) {
+		GaimConversation *conv;
+
+		conv = gaim_find_conversation(msn_user_get_passport(swboard->user));
+
 		swboard->chat = serv_got_joined_chat(gc, ++swboard->chat_id,
 											 "MSN Chat");
 		gaim_chat_add_user(GAIM_CHAT(swboard->chat),
@@ -197,6 +207,8 @@
 						   gaim_account_get_username(account), NULL);
 
 		msn_user_unref(swboard->user);
+
+		gaim_conversation_destroy(conv);
 	}
 
 	if (swboard->chat != NULL)