Use the standard confitional if sentence. ** Fixes bug 573870

2009-03-04  Jeff Cai <jeff.cai@sun.com>

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

svn path=/trunk/; revision=10127

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index fe96408..488f687 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-04  Jeff Cai <jeff.cai@sun.com>
+
+       * libebook/e-contact.c: (n_setter): 
+       Use the standard confitional if sentence.
+       ** Fixes bug 573870
+
 2009-03-03  Tobias Mueller  <tobiasmue@svn.gnome.org>
 
        * backends/vcf/e-book-backend-vcf.c (set_revision):

diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 5657d42..3d9ac17 100644 (file)
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -599,11 +599,11 @@ n_setter (EContact *contact, EVCardAttribute *attr, void *data)
 {
        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);