# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1229224191 0
# Node ID d6de4f9de12d3c7530caafec8673af7e9f95c6c8
# Parent  5ec72dbdd28e8fcecc3e8a75816d3df8fb5a9fb8
Make the add/remove buddy from list functions take a MsnUser* instead of the
email address so that ADL & RML can use the network ID the way I intended.

References #3322.
References #6755.

diff -r 5ec72dbdd28e -r d6de4f9de12d libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun Dec 14 02:58:44 2008 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Dec 14 03:09:51 2008 +0000
@@ -1958,7 +1958,7 @@
 
 void
 msn_notification_add_buddy_to_list(MsnNotification *notification, MsnListId list_id,
-							  const char *who)
+							  MsnUser *user)
 {
 	MsnCmdProc *cmdproc;
 	MsnListOp list_op = 1 << list_id;
@@ -1971,8 +1971,8 @@
 	adl_node = xmlnode_new("ml");
 	adl_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, adl_node, who, list_op,
-						MSN_NETWORK_PASSPORT);
+	msn_add_contact_xml(notification->session, adl_node, user->passport,
+	                    list_op, user->networkid);
 
 	payload = xmlnode_to_str(adl_node,&payload_len);
 	xmlnode_free(adl_node);
@@ -1984,7 +1984,7 @@
 
 void
 msn_notification_rem_buddy_from_list(MsnNotification *notification, MsnListId list_id,
-						   const char *who)
+						   MsnUser *user)
 {
 	MsnCmdProc *cmdproc;
 	MsnTransaction *trans;
@@ -1998,7 +1998,8 @@
 	rml_node = xmlnode_new("ml");
 	rml_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, rml_node, who, list_op, MSN_NETWORK_PASSPORT);
+	msn_add_contact_xml(notification->session, rml_node, user->passport,
+	                    list_op, user->networkid);
 
 	payload = xmlnode_to_str(rml_node, &payload_len);
 	xmlnode_free(rml_node);
diff -r 5ec72dbdd28e -r d6de4f9de12d libpurple/protocols/msn/notification.h
--- a/libpurple/protocols/msn/notification.h	Sun Dec 14 02:58:44 2008 +0000
+++ b/libpurple/protocols/msn/notification.h	Sun Dec 14 03:09:51 2008 +0000
@@ -42,6 +42,7 @@
 #include "session.h"
 #include "servconn.h"
 #include "cmdproc.h"
+#include "user.h"
 
 struct _MsnNotification
 {
@@ -64,9 +65,9 @@
 void msn_notification_init(void);
 
 void msn_notification_add_buddy_to_list(MsnNotification *notification,
-					MsnListId list_id, const char *who);
+					MsnListId list_id, MsnUser *user);
 void msn_notification_rem_buddy_from_list(MsnNotification *notification,
-					  MsnListId list_id, const char *who);
+					  MsnListId list_id, MsnUser *user);
 
 void msn_notification_send_fqy(MsnSession *session, const char *passport);
 
diff -r 5ec72dbdd28e -r d6de4f9de12d libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Sun Dec 14 02:58:44 2008 +0000
+++ b/libpurple/protocols/msn/userlist.c	Sun Dec 14 03:09:51 2008 +0000
@@ -668,7 +668,7 @@
 
 	msn_user_unset_op(user, list_op);
 
-	msn_notification_rem_buddy_from_list(userlist->session->notification, list_id, who);
+	msn_notification_rem_buddy_from_list(userlist->session->notification, list_id, user);
 }
 
 /*add buddy*/
@@ -829,7 +829,7 @@
 
 	msn_user_set_op(user, list_op);
 
-	msn_notification_add_buddy_to_list(userlist->session->notification, list_id, who);
+	msn_notification_add_buddy_to_list(userlist->session->notification, list_id, user);
 }
 
 gboolean