pidgin: 2153f410: disapproval of revision '2f409bcdde5ebbb...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 2153f4107240dcbbf4ee52f56a5a310f1c9be4d9
Ancestor: 2f409bcdde5ebbb1edf097aeb4b4366d7c71518d
Author: qulogic at pidgin.im
Date: 2008-11-23T21:57:18
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2153f4107240dcbbf4ee52f56a5a310f1c9be4d9

Modified files:
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/switchboard.c

ChangeLog: 

disapproval of revision '2f409bcdde5ebbb1edf097aeb4b4366d7c71518d'
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/notification.c	648cf161239f36f0abe0a43ea44693855e7b86b6
+++ libpurple/protocols/msn/notification.c	ea7644b1389c1b91eab7ea7fc66c5f3c5a769c93
@@ -491,7 +491,7 @@ ubm_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	 * command and we are processing it */
 	if (cmd->payload == NULL) {
 		cmdproc->last_cmd->payload_cb = msg_cmd_post;
-		cmd->payload_len = atoi(cmd->params[3]);
+		cmd->payload_len = atoi(cmd->params[4]);
 	} else {
 		g_return_if_fail(cmd->payload_cb != NULL);
 
@@ -1578,7 +1578,7 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCom
 	MsnUser *user;
 	const char *passport;
 	char *psm_str, *str;
-	CurrentMedia media = {CURRENT_MEDIA_UNKNOWN, NULL, NULL, NULL};
+	CurrentMedia media = {NULL, NULL, NULL};
 
 	session = cmdproc->session;
 	account = session->account;
============================================================
--- libpurple/protocols/msn/switchboard.c	7a97c02db70c547f774794f7033bee831e012099
+++ libpurple/protocols/msn/switchboard.c	8a0b0cf2ed01500745519525b4c8eb5040a36970
@@ -577,7 +577,6 @@ release_msg(MsnSwitchBoard *swboard, Msn
 	MsnTransaction *trans;
 	char *payload;
 	gsize payload_len;
-	char flag;
 
 	g_return_if_fail(swboard != NULL);
 	g_return_if_fail(msg     != NULL);
@@ -591,35 +590,32 @@ release_msg(MsnSwitchBoard *swboard, Msn
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
-	flag = msn_message_get_flag(msg);
 	trans = msn_transaction_new(cmdproc, "MSG", "%c %" G_GSIZE_FORMAT,
-								flag, payload_len);
+								msn_message_get_flag(msg), payload_len);
 
 	/* Data for callbacks */
 	msn_transaction_set_data(trans, msg);
 
-	if (flag != 'U') {
-		if (msg->type == MSN_MSG_TEXT)
+	if (msg->type == MSN_MSG_TEXT)
+	{
+		msg->ack_ref = TRUE;
+		msn_message_ref(msg);
+		swboard->ack_list = g_list_append(swboard->ack_list, msg);
+		msn_transaction_set_timeout_cb(trans, msg_timeout);
+	}
+	else if (msg->type == MSN_MSG_SLP)
+	{
+		msg->ack_ref = TRUE;
+		msn_message_ref(msg);
+		swboard->ack_list = g_list_append(swboard->ack_list, msg);
+		msn_transaction_set_timeout_cb(trans, msg_timeout);
+#if 0
+		if (msg->ack_cb != NULL)
 		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
+			msn_transaction_add_cb(trans, "ACK", msg_ack);
+			msn_transaction_add_cb(trans, "NAK", msg_nak);
 		}
-		else if (msg->type == MSN_MSG_SLP)
-		{
-			msg->ack_ref = TRUE;
-			msn_message_ref(msg);
-			swboard->ack_list = g_list_append(swboard->ack_list, msg);
-			msn_transaction_set_timeout_cb(trans, msg_timeout);
-#if 0
-			if (msg->ack_cb != NULL)
-			{
-				msn_transaction_add_cb(trans, "ACK", msg_ack);
-				msn_transaction_add_cb(trans, "NAK", msg_nak);
-			}
 #endif
-		}
 	}
 
 	trans->payload = payload;
@@ -810,7 +806,7 @@ ubm_cmd(MsnCmdProc *cmdproc, MsnCommand 
 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	purple_debug_misc("msn", "get UBM...\n");
-	cmd->payload_len = atoi(cmd->params[3]);
+	cmd->payload_len = atoi(cmd->params[4]);
 	cmdproc->last_cmd->payload_cb = msg_cmd_post;
 }