im.pidgin.pidgin: 78f5978dab9643de34de9dd3109a04fd676ac993

[typ0 at pidgin.im]

revision:            78f5978dab9643de34de9dd3109a04fd676ac993
date:                2007-10-04T01:40:20
author:              typ0 at pidgin.im
branch:              im.pidgin.pidgin
changelog:
Correctly remove a buddy from the Pending list after it is accepted.

manifest:
format_version "1"

new_manifest [e5ac96aa9bebbbbb110ceb7bad2339bc73f28c6e]

old_revision [02a88f67c2a77e3dc2ec3868ea0c68192193c33f]

patch "libpurple/protocols/msn/notification.c"
 from [50f4a7162c9ab91d492a768f2621b223281a6728]
   to [69711ff05d72c9f038eebd14827e975eaf245202]

patch "libpurple/protocols/msn/soap.c"
 from [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
   to [44a9818a90a4f96b34676103f52652d38d2f0d9e]

patch "libpurple/protocols/msn/userlist.c"
 from [9600051ba1cca50d06264efee41da6096b0272af]
   to [87d250061a253d9748b6b17fab35be24d3213971]
-------------- next part --------------
#
#
# patch "libpurple/protocols/msn/notification.c"
#  from [50f4a7162c9ab91d492a768f2621b223281a6728]
#    to [69711ff05d72c9f038eebd14827e975eaf245202]
# 
# patch "libpurple/protocols/msn/soap.c"
#  from [8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7]
#    to [44a9818a90a4f96b34676103f52652d38d2f0d9e]
# 
# patch "libpurple/protocols/msn/userlist.c"
#  from [9600051ba1cca50d06264efee41da6096b0272af]
#    to [87d250061a253d9748b6b17fab35be24d3213971]
#
============================================================
--- libpurple/protocols/msn/notification.c	50f4a7162c9ab91d492a768f2621b223281a6728
+++ libpurple/protocols/msn/notification.c	69711ff05d72c9f038eebd14827e975eaf245202
@@ -1203,8 +1203,6 @@ prp_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	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];
============================================================
--- libpurple/protocols/msn/soap.c	8a27072e32a3cb6052fcaafc1dcd0d1abb6b65d7
+++ libpurple/protocols/msn/soap.c	44a9818a90a4f96b34676103f52652d38d2f0d9e
@@ -765,7 +765,7 @@ void
  * 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 @@ msn_soap_post(MsnSoapConn *soapconn,MsnS
 			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*/
============================================================
--- libpurple/protocols/msn/userlist.c	9600051ba1cca50d06264efee41da6096b0272af
+++ libpurple/protocols/msn/userlist.c	87d250061a253d9748b6b17fab35be24d3213971
@@ -53,8 +53,7 @@ msn_accept_add_cb(gpointer data)
 
 		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);