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

[jeffcai svn gnome org]

Author: jeffcai
Date: Wed Mar  4 02:46:36 2009
New Revision: 10127
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10127&view=rev

Log:
2009-03-04  Jeff Cai <jeff cai sun com>

    * libebook/e-contact.c: (n_setter):
    Use the standard confitional if sentence.
    ** Fixes bug 573870



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	Wed Mar  4 02:46:36 2009
@@ -599,11 +599,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 ? name->family : "");
+	e_vcard_attribute_add_value (attr, name->given ? name->given : "");
+	e_vcard_attribute_add_value (attr, name->additional ? name->additional : "");
+	e_vcard_attribute_add_value (attr, name->prefixes ? name->prefixes : "");
+	e_vcard_attribute_add_value (attr, name->suffixes ? 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);