# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1300059642 0
# Node ID c78c13eee4e6d4cf3ecb29a4f4b03d586c2e8032
# Parent  c39838d078e47f9e8278c81d7ecf5471b3e84227
Output an error if the notification id was not 1 instead of it's just
407. If it is 407, then show the "too long" message, otherwise use a
generic error.

Refs #13468.

diff -r c39838d078e4 -r c78c13eee4e6 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun Mar 13 18:04:52 2011 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Mar 13 23:40:42 2011 +0000
@@ -1186,13 +1186,18 @@
 
 	id = xmlnode_get_attrib(msg, "id");
 
-	if (id && !strcmp(id, "407")) {
+	if (id && strcmp(id, "1")) {
 		PurpleConversation *conv
 			= purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
 			                                        who, gc->account);
 		if (conv != NULL) {
-			purple_conversation_write(conv, NULL,
-			                          _("Mobile message was not sent because it was too long."),
+			const char *error;
+			if (!strcmp(id, "407"))
+				error = _("Mobile message was not sent because it was too long.");
+			else
+				error = _("Mobile message was not sent because an unknown error occurred.");
+
+			purple_conversation_write(conv, NULL, error,
 			                          PURPLE_MESSAGE_ERROR, time(NULL));
 
 			if ((id = xmlnode_get_attrib(payloadNode, "id")) != NULL) {