comparison src/protocols/msn/switchboard.c @ 10612:f0fd35985cb0

[gaim-migrate @ 12067] This should fix using multiple switchboards for a single conversation, which was happening when Gaim didn't initiate the conversation. committer: Tailor Script <[e-mail]>

10611:41a18bf60ee1

		 gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT))
	{
		serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final,
						 time(NULL));
		if (swboard->conv == NULL)
			swboard->conv = gaim_find_chat(gc, swboard->chat_id);
	}
	else
	{
		serv_got_im(gc, passport, body_final, 0, time(NULL));
		if (swboard->conv == NULL)
			swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_IM,
									passport, gaim_connection_get_account(gc));
	}

	g_free(body_final);
}

10612:f0fd35985cb0

		 gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT))
	{
		serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final,
						 time(NULL));
		if (swboard->conv == NULL)
		{
			swboard->conv = gaim_find_chat(gc, swboard->chat_id);
			swboard->flag |= MSN_SB_FLAG_IM;
		}
	}
	else
	{
		serv_got_im(gc, passport, body_final, 0, time(NULL));
		if (swboard->conv == NULL)
		{
			swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_IM,
									passport, gaim_connection_get_account(gc));
			swboard->flag |= MSN_SB_FLAG_IM;
		}
	}

	g_free(body_final);
}