diff src/protocols/msn/msn.c @ 10346:bbf738a0ce7b

[gaim-migrate @ 11560] More more MSN bug fixes from Felipe Contreras, and I fixed up the display of messages that failed to send so that it matches what you tried to send and doesn't have kittens with html entities and such. I added a GAIM_MESSAGE_RAW type in HEAD to make the display of such messages even more accurate, but I don't think such a cosmetic change, which would bump us to 1.2.0, is all that important for oldstatus. committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/msn.c	Sat Dec 11 20:01:58 2004 +0000
+++ b/src/protocols/msn/msn.c	Sun Dec 12 17:37:36 2004 +0000
@@ -781,6 +781,7 @@
 		format = msn_message_get_attr(msg, "X-MMS-IM-Format");
 		msn_parse_format(format, &pre, &post);
 		body_str = g_strdup_printf("%s%s%s", pre, body_enc, post);
+		g_free(body_enc);
 		g_free(pre);
 		g_free(post);
 
@@ -824,6 +825,9 @@
 	if (swboard->empty)
 		return 0;
 
+	if (!g_queue_is_empty(swboard->im_queue))
+		return 0;
+
 	msg = msn_message_new(MSN_MSG_TYPING);
 	msn_message_set_content_type(msg, "text/x-msmsgscontrol");
 	msn_message_set_flag(msg, 'U');
@@ -831,16 +835,7 @@
 						 gaim_account_get_username(account));
 	msn_message_set_bin_data(msg, "\r\n", 2);
 
-	swboard = msn_session_get_swboard(session, who);
-
-	if (!g_queue_is_empty(swboard->im_queue) || swboard->empty)
-	{
-		msn_switchboard_queue_msg(swboard, msg);
-	}
-	else
-	{
-		msn_switchboard_send_msg(swboard, msg);
-	}
+	msn_switchboard_send_msg(swboard, msg);
 
 	msn_message_destroy(msg);