# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1055666997 0
# Node ID 1a2fcda8a5e77b9c5f3c3ff7fce273e91ae8b5ec
# Parent  466e0103ff8b9ce29e21e34063265bcd406b2998
[gaim-migrate @ 6322]
Adding buddies and receiving ADDs from MSN buddies should work right now,
for real this time.

committer: Tailor Script <tailor@pidgin.im>

diff -r 466e0103ff8b -r 1a2fcda8a5e7 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Sun Jun 15 08:33:25 2003 +0000
+++ b/src/protocols/msn/notification.c	Sun Jun 15 08:49:57 2003 +0000
@@ -421,19 +421,26 @@
 	GaimConnection *gc = gaim_account_get_connection(account);
 	MsnPermitAdd *pa;
 	GSList *sl;
-	const char *list, *passport;
+	const char *list, *passport, *group_id = NULL;
 	char *friend;
 	char msg[MSN_BUF_LEN];
 
 	list = params[1];
-	passport = params[2];
 
-	friend = msn_url_decode(params[3]);
+	if (!strcmp(params[0], "0")) {
+		passport = params[3];
+		friend = msn_url_decode(params[4]);
+	}
+	else {
+		passport = params[2];
+		friend   = msn_url_decode(params[3]);
+		group_id = params[4];
+	}
 
 	if (!g_ascii_strcasecmp(list, "FL")) {
 		user = msn_user_new(session, passport, NULL);
 
-		msn_user_set_group_id(user, atoi(params[4]));
+		msn_user_set_group_id(user, atoi(group_id));
 
 		add_buddy(servconn, user);