# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1228966276 0
# Node ID 8d1ff9c7b88921cbb2efce41877f856b4da4547b
# Parent  2f84f888d3dba180f15ae406c43ef4ce1f1ad2b4# Parent  6f41450584a7f2f26e57dde361164f38a02f8a5c
merge of '2d203a89c855916b5c37a95cc1869c15b24f812c'
     and '81aa401ac9855c99eb55a7cf91fa221860dee220'

diff -r 2f84f888d3db -r 8d1ff9c7b889 ChangeLog
--- a/ChangeLog	Wed Dec 10 11:11:32 2008 +0000
+++ b/ChangeLog	Thu Dec 11 03:31:16 2008 +0000
@@ -22,7 +22,7 @@
 	  called before the buddy list is initialized (Florian Quèze)
 	* On MSN, the Games and Office media can now be set and displayed (in
 	  addition to the previous Music media). The Media status text now shows
-	  the album, if possible. 
+	  the album, if possible.
 
 	Gadu-Gadu:
 	* Fix some problems with Gadu-Gadu buddy icons (Adam Strzelecki)
diff -r 2f84f888d3db -r 8d1ff9c7b889 libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c	Wed Dec 10 11:11:32 2008 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Thu Dec 11 03:31:16 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 2f84f888d3db -r 8d1ff9c7b889 libpurple/protocols/bonjour/buddy.c
--- a/libpurple/protocols/bonjour/buddy.c	Wed Dec 10 11:11:32 2008 +0000
+++ b/libpurple/protocols/bonjour/buddy.c	Thu Dec 11 03:31:16 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;