# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1184629841 0
# Node ID 9816af55f45c21abea9d80bba5f2867c15568661
# Parent  619d195052bac308bae2fbb8876effbcc61c8026# Parent  2f99cf09d912bbdbd611938fb528b11f05adb9b9
merge of '16545633f55b708a351f38a9532d94b0b00eacec'
     and 'be582d1ac8a250870b9c691a8cb1ab4c170650bc'

diff -r 619d195052ba -r 9816af55f45c libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Mon Jul 16 23:47:26 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Mon Jul 16 23:50:41 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);
diff -r 619d195052ba -r 9816af55f45c libpurple/protocols/oscar/family_locate.c
--- a/libpurple/protocols/oscar/family_locate.c	Mon Jul 16 23:47:26 2007 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Mon Jul 16 23:50:41 2007 +0000
@@ -1264,10 +1264,13 @@
 	 * this buddy's info explicitly, then notify them that we have info
 	 * for this buddy.
 	 */
-	was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn);
-	if (was_explicit == TRUE)
-		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-			ret = userfunc(od, conn, frame, userinfo2);
+	if (userinfo2 != NULL)
+	{
+		was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn);
+		if (was_explicit == TRUE)
+			if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+				ret = userfunc(od, conn, frame, userinfo2);
+	}
 
 	return ret;
 }