# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1228756792 0
# Node ID acd98ea6c6f97ae65e6ed05c84fd9be2fb9ed740
# Parent  641fe4c2b2a57d45b4762b5da8f95781db0af63f# Parent  efe41c4e0df0d1fa4f85cbe80a550dc6a357d53a
merge of '08fd5918978aecbd045771fb72fd0d80c7fcf941'
     and 'f74d7dbbb04d8d3d1d07486f87dcd96937196c88'

diff -r 641fe4c2b2a5 -r acd98ea6c6f9 libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c	Mon Dec 08 02:22:59 2008 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Mon Dec 08 17:19:52 2008 +0000
@@ -376,20 +376,20 @@
 	}
 
 	/* Only show first/last name if there is a nickname set (to avoid duplication) */
-	if (bb->nick != NULL) {
-		if (bb->first != NULL)
+	if (bb->nick != NULL && *bb->nick != '\0') {
+		if (bb->first != NULL && *bb->first != '\0')
 			purple_notify_user_info_add_pair(user_info, _("First name"), bb->first);
-		if (bb->first != NULL)
+		if (bb->last != NULL && *bb->last != '\0')
 			purple_notify_user_info_add_pair(user_info, _("Last name"), bb->last);
 	}
 
-	if (bb->email != NULL)
+	if (bb->email != NULL && *bb->email != '\0')
 		purple_notify_user_info_add_pair(user_info, _("Email"), bb->email);
 
-	if (bb->AIM != NULL)
+	if (bb->AIM != NULL && *bb->AIM != '\0')
 		purple_notify_user_info_add_pair(user_info, _("AIM Account"), bb->AIM);
 
-	if (bb->jid!= NULL)
+	if (bb->jid != NULL && *bb->jid != '\0')
 		purple_notify_user_info_add_pair(user_info, _("XMPP Account"), bb->jid);
 }
 
diff -r 641fe4c2b2a5 -r acd98ea6c6f9 libpurple/protocols/bonjour/buddy.c
--- a/libpurple/protocols/bonjour/buddy.c	Mon Dec 08 02:22:59 2008 +0000
+++ b/libpurple/protocols/bonjour/buddy.c	Mon Dec 08 17:19:52 2008 +0000
@@ -161,7 +161,7 @@
 	name = purple_buddy_get_name(buddy);
 
 	/* Create the alias for the buddy using the first and the last name */
-	if (bonjour_buddy->nick)
+	if (bonjour_buddy->nick && *bonjour_buddy->nick)
 		serv_got_alias(purple_account_get_connection(account), name, bonjour_buddy->nick);
 	else {
 		gchar *alias = NULL;