# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1063515336 0
# Node ID ccfbd7c552ba98f346e92f12e846f650cdf92f07
# Parent  f03c0085c424706bf6ac93ca81da5776240ba798
[gaim-migrate @ 7378]
Parse the MSNObject after setting the friendly name. This prevents the
MSNObject from appearing as the friendly name in the tooltip, due to
msn_url_decode using static buffers.

committer: Tailor Script <tailor@pidgin.im>

diff -r f03c0085c424 -r ccfbd7c552ba src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Sun Sep 14 03:26:27 2003 +0000
+++ b/src/protocols/msn/notification.c	Sun Sep 14 04:55:36 2003 +0000
@@ -1052,6 +1052,8 @@
 	passport = params[2];
 	friend   = msn_url_decode(params[3]);
 
+	serv_got_alias(gc, (char *)passport, (char *)friend);
+
 	if (session->protocol_ver >= 9 && param_count == 6)
 	{
 		user = msn_users_find_with_passport(session->users, passport);
@@ -1060,8 +1062,6 @@
 		msn_user_set_object(user, msnobj);
 	}
 
-	serv_got_alias(gc, (char *)passport, (char *)friend);
-
 	if ((b = gaim_find_buddy(gc->account, passport)) != NULL)
 		status |= ((((b->uc) >> 1) & 0xF0) << 1);
 
@@ -1471,6 +1471,8 @@
 	passport = params[1];
 	friend   = msn_url_decode(params[2]);
 
+	serv_got_alias(gc, (char *)passport, (char *)friend);
+
 	if (session->protocol_ver >= 9 && param_count == 5)
 	{
 		user = msn_users_find_with_passport(session->users, passport);
@@ -1479,8 +1481,6 @@
 		msn_user_set_object(user, msnobj);
 	}
 
-	serv_got_alias(gc, (char *)passport, (char *)friend);
-
 	if (!g_ascii_strcasecmp(state, "BSY"))
 		status |= UC_UNAVAILABLE | (MSN_BUSY << 1);
 	else if (!g_ascii_strcasecmp(state, "IDL"))