# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1086554753 0
# Node ID 554ef91db2dd811b8fda4336e83ccdbd9b10fa81
# Parent  3e0cd1c6ddc71f2938cf58d7acad48af02b75a02
[gaim-migrate @ 10021]
Another fix, like the previous time, and some #if 0'd debug info. The MSN
servers are doing something they're not supposed to do, it seems. We're
investigating.

committer: Tailor Script <tailor@pidgin.im>

diff -r 3e0cd1c6ddc7 -r 554ef91db2dd src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Sun Jun 06 20:31:20 2004 +0000
+++ b/src/protocols/msn/notification.c	Sun Jun 06 20:45:53 2004 +0000
@@ -317,6 +317,8 @@
 
 	if (user == NULL)
 	{
+		gaim_debug_info("msn", "Creating new user. '%s' was not found.\n",
+						passport);
 		user = msn_user_new(session->userlist, passport, friendly);
 		msn_userlist_add_user(session->userlist, user);
 	}
diff -r 3e0cd1c6ddc7 -r 554ef91db2dd src/protocols/msn/sync.c
--- a/src/protocols/msn/sync.c	Sun Jun 06 20:31:20 2004 +0000
+++ b/src/protocols/msn/sync.c	Sun Jun 06 20:45:53 2004 +0000
@@ -121,6 +121,14 @@
 	friend     = gaim_url_decode(cmd->params[1]);
 	list_op    = atoi(cmd->params[2]);
 
+#if 0
+	gaim_debug_misc("msn", "Got list op = %d\n", list_op);
+	gaim_debug_misc("msn", "FL = %d\n", (list_op & MSN_LIST_FL_OP));
+	gaim_debug_misc("msn", "AL = %d\n", (list_op & MSN_LIST_AL_OP));
+	gaim_debug_misc("msn", "BL = %d\n", (list_op & MSN_LIST_BL_OP));
+	gaim_debug_misc("msn", "RL = %d\n", (list_op & MSN_LIST_RL_OP));
+#endif
+
 	user = msn_user_new(session->userlist, passport, friend);
 
 	msn_userlist_add_user(session->userlist, user);
diff -r 3e0cd1c6ddc7 -r 554ef91db2dd src/protocols/msn/userlist.c
--- a/src/protocols/msn/userlist.c	Sun Jun 06 20:31:20 2004 +0000
+++ b/src/protocols/msn/userlist.c	Sun Jun 06 20:45:53 2004 +0000
@@ -246,6 +246,14 @@
 						"%s has added you to his or her contact list.\n",
 						passport);
 
+#if 0
+		gaim_debug_misc("msn", "User's list op = %d\n", user->list_op);
+		gaim_debug_misc("msn", "FL = %d\n", (user->list_op & MSN_LIST_FL_OP));
+		gaim_debug_misc("msn", "AL = %d\n", (user->list_op & MSN_LIST_AL_OP));
+		gaim_debug_misc("msn", "BL = %d\n", (user->list_op & MSN_LIST_BL_OP));
+		gaim_debug_misc("msn", "RL = %d\n", (user->list_op & MSN_LIST_RL_OP));
+#endif
+
 		if (!(user->list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP |
 							   MSN_LIST_FL_OP)))
 		{
@@ -367,8 +375,11 @@
 		/* These are users who have us on their contact list. */
 		/* TODO: what does store name is when this happens? */
 
-		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
+		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP |
+						 MSN_LIST_FL_OP)))
+		{
 			got_new_entry(gc, passport, store);
+		}
 	}
 
 	user->list_op = list_op;
@@ -413,6 +424,8 @@
 void
 msn_userlist_add_user(MsnUserList *userlist, MsnUser *user)
 {
+	gaim_debug_misc("msn", "[%p] Adding %s (%p)\n",
+					userlist, user->passport, user);
 	userlist->users = g_list_append(userlist->users, user);
 }
 
@@ -435,6 +448,11 @@
 
 		g_return_val_if_fail(user->passport != NULL, NULL);
 
+#if 0
+		gaim_debug_misc("msn", "[%p] Comparing '%s' and '%s' (%p)\n",
+						userlist, passport, user->passport, user);
+#endif
+
 		if (!strcmp(passport, user->passport))
 			return user;
 	}