Mercurial > pidgin
changeset 26814:985e7f8d8744
merge of '233c28248ecd717704ccb1932748bdf97b679cf1'
and 'f575a8d88f75dfe9f1541c8c290a3b7ef621c4a0'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Mon, 04 May 2009 00:04:55 +0000 |
| parents | 18129e760e10 (diff) 5f9c475b57ca (current diff) |
| children | 0cc77ced0ae3 bcc577785c2b |
| files | libpurple/protocols/msn/notification.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/useravatar.c Sun May 03 23:58:14 2009 +0000 +++ b/libpurple/protocols/jabber/useravatar.c Mon May 04 00:04:55 2009 +0000 @@ -46,7 +46,7 @@ remove_avatar_0_12_nodes(JabberStream *js) { #if 0 - See note below for why this is #if 0d + /* See note below for why this is #if 0'd */ /* Publish an empty avatar according to the XEP-0084 v0.12 semantics */ xmlnode *publish, *item, *metadata;
--- a/libpurple/protocols/msn/notification.c Sun May 03 23:58:14 2009 +0000 +++ b/libpurple/protocols/msn/notification.c Mon May 04 00:04:55 2009 +0000 @@ -619,7 +619,11 @@ purple_debug_warning("msn", "Ignoring user %s about which server knows nothing.\n", passport); - session->adl_fqy--; + /* Decrement the count for unknown results so that we'll continue login. + Also, need to finish the login process here as well, because ADL OK + will not be called. */ + if (--session->adl_fqy == 0) + msn_session_finish_login(session); return; }