# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1178116065 0
# Node ID 2ff9195a35ce3b6a62bcd3900072b7445f7432f5
# Parent  e3f4f1fd8f3df375b392d36ecc3684bbd1b7d8ff# Parent  db38488fd2ff4091e2c8e2c08f6442c016388650
merge of '5f4a03fa07b74453c3b8312c388af42739fd16db'
     and '7ca58433ae1536292fa1729bd1b5f8b0ab0b4c01'

diff -r db38488fd2ff -r 2ff9195a35ce libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c	Wed May 02 14:17:40 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Wed May 02 14:27:45 2007 +0000
@@ -460,6 +460,7 @@
 	const char *fullname = NULL;
 #endif
 	char *splitpoint = NULL;
+	char *tmp;
 	char hostname[255];
 
 #ifndef _WIN32
@@ -545,7 +546,16 @@
 	if (splitpoint != NULL)
 	{
 		default_firstname = g_strndup(fullname, splitpoint - fullname);
-		default_lastname = g_strdup(&splitpoint[1]);
+		tmp = &splitpoint[1];
+		
+		/* The last name may be followed by a comma and additional data.
+		 * Only use the last name itself.
+		 */
+		splitpoint = strchr(tmp, ',');
+		if (splitpoint != NULL)
+			default_lastname = g_strndup(tmp, splitpoint - tmp);			
+		else
+			default_lastname = g_strdup(tmp);
 	}
 	else
 	{