# HG changeset patch
# User Carlos Silva <typ0@pidgin.im>
# Date 1191462020 0
# Node ID 58ce69a8582d9e0e0eb50531a146bcd3983a06c6
# Parent  53691c081eab8d1c2b616c1c2f9bc18f6ebeee8e
Correctly remove a buddy from the Pending list after it is accepted.

diff -r 53691c081eab -r 58ce69a8582d libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Wed Oct 03 18:45:31 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Thu Oct 04 01:40:20 2007 +0000
@@ -1203,8 +1203,6 @@
 	MsnSession *session = cmdproc->session;
 	const char *type, *value, *friendlyname;
 
-	purple_debug_info("MSN Notification", "prp_cmd()\n");
-
 	g_return_if_fail(cmd->param_count >= 3);
 
 	type  = cmd->params[2];
diff -r 53691c081eab -r 58ce69a8582d libpurple/protocols/msn/soap.c
--- a/libpurple/protocols/msn/soap.c	Wed Oct 03 18:45:31 2007 +0000
+++ b/libpurple/protocols/msn/soap.c	Thu Oct 04 01:40:20 2007 +0000
@@ -765,7 +765,7 @@
  * if not connected, Connected first.
  */
 void
-msn_soap_post(MsnSoapConn *soapconn,MsnSoapReq *request)
+msn_soap_post(MsnSoapConn *soapconn, MsnSoapReq *request)
 {
 	MsnSoapReq *head_request;
 
@@ -809,10 +809,15 @@
 			return;
 		}
 
+#ifdef MSN_SOAP_DEBUG
 		purple_debug_info("MSN SOAP", "Currently processing another SOAP request\n");
 	} else {
 		purple_debug_info("MSN SOAP", "No requests left to dispatch\n");
 	}
+#else
+      }
+#endif
+
 }
 
 /*Post the soap request action*/
diff -r 53691c081eab -r 58ce69a8582d libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Wed Oct 03 18:45:31 2007 +0000
+++ b/libpurple/protocols/msn/userlist.c	Thu Oct 04 01:40:20 2007 +0000
@@ -53,8 +53,7 @@
 
 		msn_userlist_add_buddy_to_list(userlist, pa->who, MSN_LIST_AL);
 
-		if (msn_userlist_user_is_in_list(user, MSN_LIST_FL))
-			msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
+		msn_del_contact_from_list(session->contact, NULL, pa->who, MSN_LIST_PL);
 	}
 
 	g_free(pa->who);