From 5b7a9e7aac6cb0cab7ecc03188ae7de91c43c53e Mon Sep 17 00:00:00 2001 From: Jeff Cai Date: Wed, 4 Mar 2009 02:46:36 +0000 Subject: [PATCH] Use the standard confitional if sentence. ** Fixes bug 573870 2009-03-04 Jeff Cai * libebook/e-contact.c: (n_setter): Use the standard confitional if sentence. ** Fixes bug 573870 svn path=/trunk/; revision=10127 --- addressbook/ChangeLog | 6 ++++++ addressbook/libebook/e-contact.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index fe96408..488f687 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2009-03-04 Jeff Cai + + * libebook/e-contact.c: (n_setter): + Use the standard confitional if sentence. + ** Fixes bug 573870 + 2009-03-03 Tobias Mueller * 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 --- 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); -- 2.7.4