diff libgaim/protocols/msn/notification.c @ 20393:40a04930b233

The second msn-p13-merge-head.diff.gz from SF Patch #162854 from Ka-Hing Cheung. "A little late, but here is a version that should remember your friendly name. Also has a fix for a crasher when MSN sends you back: <faultstring>Need to do full sync. Can't sync deltas Client has too old a copy for us to do a delta sync</faultstring> In this case, I make gaim re-request the full contact list/address book. I haven't look too deeply into the reverse list problem, but I think the solution would involve caching the reverse list, which may require extending the privacy api."

--- a/libgaim/protocols/msn/notification.c	Sun Apr 15 03:01:41 2007 +0000
+++ b/libgaim/protocols/msn/notification.c	Sun Apr 15 03:02:48 2007 +0000
@@ -626,18 +626,9 @@
 }
 
 static void
-msn_notification_post_adl(MsnCmdProc *cmdproc,char *payload, int payload_len)
+msn_notification_post_adl(MsnCmdProc *cmdproc, char *payload, int payload_len)
 {
 	MsnTransaction *trans;
-	const char *display_name;
-	const char *friendly;
-
-	display_name = gaim_connection_get_display_name(cmdproc->session->account->gc);
-	if (display_name) {
-		friendly = gaim_url_encode(display_name);
-		msn_cmdproc_send(cmdproc, "PRP", "MFN %s", friendly);
-	}
-
 
 	gaim_debug_info("MaYuan","Send ADL{%s}\n",payload);
 	trans = msn_transaction_new(cmdproc, "ADL","%d",strlen(payload));
@@ -655,6 +646,7 @@
 	xmlnode *adl_node;
 	char *payload;
 	int payload_len;
+	const char *display_name;
 
 	userlist = session->userlist;
 	adl_node = xmlnode_new("ml");
@@ -671,6 +663,13 @@
 	xmlnode_free(adl_node);
 
 	msn_notification_post_adl(session->notification->cmdproc,payload,payload_len);
+
+	display_name = gaim_connection_get_display_name(session->account->gc);
+	if (display_name && strcmp(display_name,
+							   gaim_account_get_username(session->account))) {
+		msn_act_id(session->account->gc, display_name);
+	}
+
 }
 
 /*Post FQY to NS,Inform add a Yahoo User*/