pidgin/android/libpurple2

merge of 'efe4fb3772ade214c04fa3fba2b27f825a0b70e8'

2011-08-11, Mark Doliner
9628fe5cd909
Parents efe4fb3772ad06a7154ee8dd
Children 0a59714bfd72
merge of 'efe4fb3772ade214c04fa3fba2b27f825a0b70e8'
and '06a7154ee8dde8d863d5c834dfdf2159abdba8f8'
2 files changed, 18 insertions(+), 13 deletions(-)
  • +16 -13
    libpurple/protocols/msn/contact.c
  • +2 -0
    libpurple/protocols/msn/session.c
    • --- a/libpurple/protocols/msn/contact.c Mon Aug 08 03:52:25 2011 +0000
    +++ b/libpurple/protocols/msn/contact.c Thu Aug 11 06:36:47 2011 +0000
    @@ -474,7 +474,7 @@
    }
    /*parse contact list*/
    -static void
    +static gboolean
    msn_parse_contact_list(MsnSession *session, xmlnode *node)
    {
    xmlnode *fault, *faultnode;
    @@ -499,13 +499,14 @@
    if (g_str_equal(errorcode, "ABDoesNotExist")) {
    msn_create_address_book(session);
    g_free(errorcode);
    - return;
    + return FALSE;
    }
    g_free(errorcode);
    }
    msn_get_contact_list(session, MSN_PS_INITIAL, NULL);
    + return FALSE;
    } else {
    xmlnode *service;
    @@ -514,6 +515,7 @@
    service; service = xmlnode_get_next_twin(service)) {
    msn_parse_each_service(session, service);
    }
    + return TRUE;
    }
    }
    @@ -534,23 +536,24 @@
    purple_debug_misc("msn", "Got the contact list!\n");
    - msn_parse_contact_list(session, resp->xml);
    + if (msn_parse_contact_list(session, resp->xml)) {
    #ifdef MSN_PARTIAL_LISTS
    - abLastChange = purple_account_get_string(session->account,
    - "ablastChange", NULL);
    - dynamicItemLastChange = purple_account_get_string(session->account,
    - "DynamicItemLastChanged", NULL);
    + abLastChange = purple_account_get_string(session->account,
    + "ablastChange", NULL);
    + dynamicItemLastChange = purple_account_get_string(session->account,
    + "DynamicItemLastChanged", NULL);
    #endif
    - if (state->partner_scenario == MSN_PS_INITIAL) {
    + if (state->partner_scenario == MSN_PS_INITIAL) {
    #ifdef MSN_PARTIAL_LISTS
    - /* XXX: this should be enabled when we can correctly do partial
    - syncs with the server. Currently we need to retrieve the whole
    - list to detect sync issues */
    - msn_get_address_book(session, MSN_PS_INITIAL, abLastChange, dynamicItemLastChange);
    + /* XXX: this should be enabled when we can correctly do partial
    + syncs with the server. Currently we need to retrieve the whole
    + list to detect sync issues */
    + msn_get_address_book(session, MSN_PS_INITIAL, abLastChange, dynamicItemLastChange);
    #else
    - msn_get_address_book(session, MSN_PS_INITIAL, NULL, NULL);
    + msn_get_address_book(session, MSN_PS_INITIAL, NULL, NULL);
    #endif
    + }
    }
    }
    }
    --- a/libpurple/protocols/msn/session.c Mon Aug 08 03:52:25 2011 +0000
    +++ b/libpurple/protocols/msn/session.c Thu Aug 11 06:36:47 2011 +0000
    @@ -288,6 +288,8 @@
    msn_session_activate_login_timeout(MsnSession *session)
    {
    if (!session->logged_in && session->connected) {
    + if (session->login_timeout)
    + purple_timeout_remove(session->login_timeout);
    session->login_timeout =
    purple_timeout_add_seconds(MSN_LOGIN_FQY_TIMEOUT,
    msn_login_timeout_cb, session);