# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1072485822 0
# Node ID 28609aa6c8653b91e20ca50f1432ddb748c28ff8
# Parent  f0784ce8189a275d9348206296a384d9612a6cac
[gaim-migrate @ 8605]
We now ensure that the friendly name is set on a user while loading the
buddy list, instead of just assuming it will be set. This should fix bugs
#844685, #856533, and a handful of others.

committer: Tailor Script <tailor@pidgin.im>

diff -r f0784ce8189a -r 28609aa6c865 src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Sat Dec 27 00:31:43 2003 +0000
+++ b/src/protocols/msn/notification.c	Sat Dec 27 00:43:42 2003 +0000
@@ -1200,6 +1200,9 @@
 
 			user = msn_user_new(session, passport, friend);
 
+			/* Ensure we have a friendly name set. */
+			msn_user_set_name(user, friend);
+
 			tokens = g_strsplit(group_nums, ",", -1);
 
 			gaim_debug_misc("msn", "Fetching group IDs from '%s'\n",
@@ -1260,6 +1263,9 @@
 				pa->user = msn_user_new(session, passport, friend);
 				pa->gc   = gc;
 
+				/* Ensure we have a friendly name set. */
+				msn_user_set_name(pa->user, friend);
+
 				g_snprintf(msg, sizeof(msg),
 						   _("The user %s (%s) wants to add you to their "
 							 "buddy list."),