# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1241395495 0
# Node ID 985e7f8d874434ec2d996262e7cd4c03b7481202
# Parent  18129e760e1082d91b46576518d340f5830e806f# Parent  5f9c475b57ca6de93f6673dc015b9a6940cb6ef0
merge of '233c28248ecd717704ccb1932748bdf97b679cf1'
     and 'f575a8d88f75dfe9f1541c8c290a3b7ef621c4a0'

diff -r 5f9c475b57ca -r 985e7f8d8744 libpurple/protocols/jabber/useravatar.c
--- 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;
diff -r 5f9c475b57ca -r 985e7f8d8744 libpurple/protocols/msn/notification.c
--- 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;
 	}