# HG changeset patch # User Christian Hammond # Date 1076791528 0 # Node ID 4de49af535b33c879675dd937fc6a4b5d804a6c7 # Parent 8a9a6eb3ded0c2ef26ab5820a1f0b89027f9d8b0 [gaim-migrate @ 8978] Patch from Stu Tomlinson: - Adds error messages for 2 new error codes (from http://www.hypothetic.org/docs/msn/reference/error_list.php) - Changes "Internal Server Error" to "Service Temporarily Unavailable" (to match what the official client reports) - Fixes indentation for msn/error.c error codes - Fixes a small bug when a user disallows mobile pages (Gaim was only updating the buddy status when a user allowed mobile pages) committer: Tailor Script diff -r 8a9a6eb3ded0 -r 4de49af535b3 ChangeLog --- a/ChangeLog Sat Feb 14 15:11:17 2004 +0000 +++ b/ChangeLog Sat Feb 14 20:45:28 2004 +0000 @@ -15,6 +15,9 @@ * TCL Plugin API changed * Tabs now stay green when they are supposed to (Etan Reisner) * Offline accounts in account drop-down lists are now greyed (Etan Reisner) + * The mobile icon on MSN users is now removed when the person disables + mobile paging (Stu Tomlinson) + * Added new MSN error codes and fixed an incorrect one (Stu Tomlinson) * Gadu-Gadu might actually connect again (Ignacy Gawedzki) * Buddy pounces for an account are removed when the account is deleted (Gary Kramlich) diff -r 8a9a6eb3ded0 -r 4de49af535b3 src/protocols/msn/error.c --- a/src/protocols/msn/error.c Sat Feb 14 15:11:17 2004 +0000 +++ b/src/protocols/msn/error.c Sat Feb 14 20:45:28 2004 +0000 @@ -108,11 +108,14 @@ break; case 500: - g_snprintf(msg, sizeof(msg), _("Internal server error")); + g_snprintf(msg, sizeof(msg), _("Service Temporarily Unavailable")); break; case 501: g_snprintf(msg, sizeof(msg), _("Database server error")); break; + case 502: + g_snprintf(msg, sizeof(msg), _("Command disabled")); + break; case 510: g_snprintf(msg, sizeof(msg), _("File operation error")); break; @@ -197,17 +200,20 @@ case 916: g_snprintf(msg, sizeof(msg), _("Server unavailable")); break; - case 920: + case 920: g_snprintf(msg, sizeof(msg), _("Not accepting new users")); break; - case 923: + case 923: g_snprintf(msg, sizeof(msg), _("Kids Passport without parental consent")); break; - case 924: + case 924: g_snprintf(msg, sizeof(msg), _("Passport account not yet verified")); break; + case 928: + g_snprintf(msg, sizeof(msg), _("Bad ticket")); + break; default: g_snprintf(msg, sizeof(msg), _("Unknown Error Code %d"), type); diff -r 8a9a6eb3ded0 -r 4de49af535b3 src/protocols/msn/notification.c --- a/src/protocols/msn/notification.c Sat Feb 14 15:11:17 2004 +0000 +++ b/src/protocols/msn/notification.c Sat Feb 14 20:45:28 2004 +0000 @@ -666,8 +666,8 @@ if (value != NULL) { if (!strcmp(type, "MOB")) { - if (!strcmp(value, "Y")) { - user->mobile = TRUE; + if (!strcmp(value, "Y") || !strcmp(value, "N")) { + user->mobile = (!strcmp(value, "Y") ? TRUE : FALSE); if ((b = gaim_find_buddy(gc->account, passport)) != NULL) { if (GAIM_BUDDY_IS_ONLINE(b)) {