Mercurial > pidgin
changeset 23513:cab5420c3879
merge of '5033650a1e57437cc3f2894adc41935daa6b3269'
and '95fe62719d362e8857a89e906a9008305e31dd5e'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 09 Jul 2008 00:32:18 +0000 |
| parents | 1061a9ad1ddb (diff) f1ff35d14a95 (current diff) |
| children | 7e16d193bb57 |
| files | libpurple/protocols/msn/slp.c libpurple/protocols/msn/soap2.c libpurple/protocols/msn/soap2.h libpurple/protocols/qq/qq_proxy.c libpurple/protocols/qq/qq_proxy.h libpurple/protocols/qq/recv_core.c libpurple/protocols/qq/recv_core.h libpurple/protocols/qq/send_core.c libpurple/protocols/qq/send_core.h libpurple/protocols/qq/sendqueue.c libpurple/protocols/qq/sendqueue.h libpurple/protocols/qq/udp_proxy_s5.c libpurple/protocols/qq/udp_proxy_s5.h |
| diffstat | 1 files changed, 9 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Sun Jun 29 20:01:14 2008 +0000 +++ b/libpurple/protocols/msn/slp.c Wed Jul 09 00:32:18 2008 +0000 @@ -1067,21 +1067,6 @@ } static void -next_buddy_request(MsnUserList *userlist) -{ - /* Free one window slot */ - userlist->buddy_icon_window++; - -#ifdef MSN_DEBUG_UD - purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n", - userlist->buddy_icon_window); -#endif - - /* Request the next one */ - msn_release_buddy_icon_request(userlist); -} - -static void request_user_display(MsnUser *user) { PurpleAccount *account; @@ -1097,19 +1082,6 @@ obj = msn_user_get_object(user); - /* Changed while in the queue. */ - if (obj == NULL) { - purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); - next_buddy_request(session->userlist); - return; - } - - /* The user went offline. */ - if (user->status == NULL) { - next_buddy_request(session->userlist); - return; - } - info = msn_object_get_sha1(obj); if (g_ascii_strcasecmp(user->passport, @@ -1139,7 +1111,14 @@ purple_buddy_icons_set_for_user(account, user->passport, g_memdup(data, len), len, info); - next_buddy_request(session->userlist); + /* Free one window slot */ + session->userlist->buddy_icon_window++; + +#ifdef MSN_DEBUG_UD + purple_debug_info("msn", "request_user_display(): buddy_icon_window++ yields =%d\n", + session->userlist->buddy_icon_window); +#endif + + msn_release_buddy_icon_request(session->userlist); } } -