pidgin/pidgin

Merge with release-2.x.y

2014-11-12, Elliott Sales de Andrade
20185d4dacbb
Parents b6b783c2b362ee51d84aacbf
Children 02dded224534
Merge with release-2.x.y
3 files changed, 14 insertions(+), 11 deletions(-)
  • +9 -7
    libpurple/protocols/msn/contact.c
  • +2 -1
    libpurple/protocols/msn/contact.h
  • +3 -3
    libpurple/protocols/msn/session.c
    • --- a/libpurple/protocols/msn/contact.c Tue Nov 11 00:35:48 2014 -0500
    +++ b/libpurple/protocols/msn/contact.c Wed Nov 12 02:37:37 2014 -0500
    @@ -487,12 +487,6 @@
    * this is not handled yet
    */
    if ((fault = purple_xmlnode_get_child(node, "Body/Fault"))) {
    - if ((faultnode = purple_xmlnode_get_child(fault, "faultstring"))) {
    - char *faultstring = purple_xmlnode_get_data(faultnode);
    - purple_debug_info("msn", "Retrieving contact list failed: %s\n",
    - faultstring);
    - g_free(faultstring);
    - }
    if ((faultnode = purple_xmlnode_get_child(fault, "detail/errorcode"))) {
    char *errorcode = purple_xmlnode_get_data(faultnode);
    @@ -505,7 +499,15 @@
    g_free(errorcode);
    }
    - msn_get_contact_list(session, MSN_PS_INITIAL, NULL);
    + if ((faultnode = purple_xmlnode_get_child(fault, "faultstring"))) {
    + char *faultstring = purple_xmlnode_get_data(faultnode);
    + purple_debug_info("msn", "Retrieving contact list failed: %s\n",
    + faultstring);
    + msn_session_set_error(session, MSN_ERROR_BAD_BLIST, faultstring);
    + g_free(faultstring);
    + } else {
    + msn_session_set_error(session, MSN_ERROR_BAD_BLIST, NULL);
    + }
    return FALSE;
    } else {
    PurpleXmlNode *service;
    --- a/libpurple/protocols/msn/contact.h Tue Nov 11 00:35:48 2014 -0500
    +++ b/libpurple/protocols/msn/contact.h Wed Nov 12 02:37:37 2014 -0500
    @@ -60,7 +60,8 @@
    #include "session.h"
    #include "soap.h"
    -#define MSN_APPLICATION_ID "CFE80F9D-180F-4399-82AB-413F33A1FA11"
    +/* Thanks to TReKiE on the #pidgin channel for this new ID. */
    +#define MSN_APPLICATION_ID "484AAC02-7F59-41B7-9601-772045DCC569"
    #define MSN_CONTACT_SERVER "local-bay.contacts.msn.com"
    --- a/libpurple/protocols/msn/session.c Tue Nov 11 00:35:48 2014 -0500
    +++ b/libpurple/protocols/msn/session.c Wed Nov 12 02:37:37 2014 -0500
    @@ -406,9 +406,9 @@
    break;
    case MSN_ERROR_BAD_BLIST:
    reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
    - msg = g_strdup(_("Your MSN buddy list is temporarily "
    - "unavailable. Please wait and try "
    - "again."));
    + msg = g_strdup_printf(_("Your MSN buddy list is temporarily "
    + "unavailable: %s"),
    + (info == NULL) ? _("Unknorn error") : info);
    break;
    default:
    reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;