# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1086498474 0
# Node ID 62b601ddb4bc7b76d78e041a1df40510255c51dc
# Parent  4c94e3f9f91ce541e9fc3d37652cad45c395acc7
[gaim-migrate @ 10005]
WORK!!!

committer: Tailor Script <tailor@pidgin.im>

diff -r 4c94e3f9f91c -r 62b601ddb4bc src/protocols/msn/userlist.c
--- a/src/protocols/msn/userlist.c	Sun Jun 06 05:01:16 2004 +0000
+++ b/src/protocols/msn/userlist.c	Sun Jun 06 05:07:54 2004 +0000
@@ -80,9 +80,21 @@
 	pa->who = g_strdup(passport);
 	pa->gc  = gc;
 
-	msg = g_strdup_printf(
-			   _("The user %s (%s) wants to add %s to his or her buddy list."),
-			   passport, friendly, gaim_account_get_username(gc->account));
+	if (friendly != NULL)
+	{
+		msg = g_strdup_printf(
+				   _("The user %s (%s) wants to add %s to his or her "
+					 "buddy list."),
+				   passport, friendly,
+				   gaim_account_get_username(gc->account));
+	}
+	else
+	{
+		msg = g_strdup_printf(
+				   _("The user %s wants to add %s to his or "
+					 "her buddy list."),
+				   passport, gaim_account_get_username(gc->account));
+	}
 
 	gaim_request_action(gc, NULL, msg, NULL, 0, pa, 2,
 						_("Authorize"), G_CALLBACK(msn_accept_add_cb),