# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1184620283 0
# Node ID d5cf2c466e9aaef0029b2a9b9bab47dc9799cd69
# Parent  84d1841638057eeebac2ea703c4f863c6327aac1# Parent  925ba3e6831ccffbccc8d48ecd998077362ae851
merge of '01d1a63fe1ad7ad2f78ff88c6540afd927693362'
     and 'd4c3811d8ca7f9e02be6a9ea4b3eba0d251d4c9a'

diff -r 84d184163805 -r d5cf2c466e9a libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun Jul 15 22:09:03 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Mon Jul 16 21:11:23 2007 +0000
@@ -705,7 +705,7 @@
 	user = msn_userlist_find_user(session->userlist, passport);
 
 	old_friendly = msn_user_get_friendly_name(user);
-	if (!old_friendly || (old_friendly && strcmp(old_friendly, friendly)))
+	if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly))))
 	{
 		serv_got_alias(gc, passport, friendly);
 		msn_user_set_friendly_name(user, friendly);