evolution-data-server r10058 - in trunk/addressbook: . libebook

[rburton svn gnome org]

Author: rburton
Date: Mon Feb 16 12:09:49 2009
New Revision: 10058
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10058&view=rev

Log:
2009-02-16  Ross Burton  <ross linux intel com>

	* libebook/e-contact.c:
	Handle EContactName structures containing NULLs.


Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/libebook/e-contact.c

Modified: trunk/addressbook/libebook/e-contact.c
==============================================================================
--- trunk/addressbook/libebook/e-contact.c	(original)
+++ trunk/addressbook/libebook/e-contact.c	Mon Feb 16 12:09:49 2009
@@ -597,11 +597,11 @@
 {
 	EContactName *name = data;
 
-	e_vcard_attribute_add_value (attr, name->family);
-	e_vcard_attribute_add_value (attr, name->given);
-	e_vcard_attribute_add_value (attr, name->additional);
-	e_vcard_attribute_add_value (attr, name->prefixes);
-	e_vcard_attribute_add_value (attr, name->suffixes);
+	e_vcard_attribute_add_value (attr, name->family ?: "");
+	e_vcard_attribute_add_value (attr, name->given ?: "");
+	e_vcard_attribute_add_value (attr, name->additional ?: "");
+	e_vcard_attribute_add_value (attr, name->prefixes ?: "");
+	e_vcard_attribute_add_value (attr, name->suffixes ?: "");
 
 	/* now find the attribute for FileAs.  if it's not present, fill it in */
 	attr = e_contact_get_first_attr (contact, EVC_X_FILE_AS);