? .e-contact-editor.c.swp
Index: e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-editor.c,v
retrieving revision 1.229
diff -u -3 -p -r1.229 e-contact-editor.c
--- e-contact-editor.c	21 Jan 2005 21:56:12 -0000	1.229
+++ e-contact-editor.c	8 Feb 2005 00:16:52 -0000
@@ -377,14 +377,24 @@ name_to_style (const EContactName *name,
 	char *string;
 	char *strings[4], **stringptr;
 	char *substring;
+	gboolean locale_show_additional;
+
+	/*
+	 * FIXME: Make this really depending on locale
+	 */
+	locale_show_additional = TRUE;
+	
 	switch (style) {
 	case 0:
 		stringptr = strings;
 		if (name) {
 			if (name->family && *name->family)
 				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
+			if (name->given && *name->given) 
+				if (name->additional && *name->additional && locale_show_additional) 
+					*(stringptr++) = g_strdup_printf ("%s %s", name->given, name->additional);
+				else
+					*(stringptr++) = name->family;
 		}
 		*stringptr = NULL;
 		string = g_strjoinv(", ", strings);
@@ -393,7 +403,10 @@ name_to_style (const EContactName *name,
 		stringptr = strings;
 		if (name) {
 			if (name->given && *name->given)
-				*(stringptr++) = name->given;
+				if (name->additional && *name->additional && locale_show_additional) 
+					*(stringptr++) = g_strdup_printf ("%s %s", name->given, name->additional);
+				else
+					*(stringptr++) = name->family;
 			if (name->family && *name->family)
 				*(stringptr++) = name->family;
 		}
@@ -410,7 +423,10 @@ name_to_style (const EContactName *name,
 			if (name->family && *name->family)
 				*(stringptr++) = name->family;
 			if (name->given && *name->given)
-				*(stringptr++) = name->given;
+				if (name->additional && *name->additional && locale_show_additional) 
+					*(stringptr++) = g_strdup_printf ("%s %s", name->given, name->additional);
+				else
+					*(stringptr++) = name->family;
 		}
 		*stringptr = NULL;
 		substring = g_strjoinv(", ", strings);