From: Philip Withnall Date: Sat, 23 Jun 2012 11:04:38 +0000 (+0100) Subject: eds: Revert checks for empty properties X-Git-Tag: FOLKS_0_7_2~32 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be138e709d9d01c60a09bc7ed2c431a6205b5fcd;p=platform%2Fupstream%2Ffolks.git eds: Revert checks for empty properties These are in the wrong place and duplicate checks further down those code paths. --- diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala index ef34982..471f3bf 100644 --- a/backends/eds/lib/edsf-persona-store.vala +++ b/backends/eds/lib/edsf-persona-store.vala @@ -378,19 +378,17 @@ public class Edsf.PersonaStore : Folks.PersonaStore { Set phone_numbers = (Set) v.get_object (); - if (!phone_numbers.is_empty) - yield this._set_contact_attributes_string (contact, - phone_numbers, "TEL", - E.ContactField.TEL); + yield this._set_contact_attributes_string (contact, + phone_numbers, "TEL", + E.ContactField.TEL); } else if (k == Folks.PersonaStore.detail_key ( PersonaDetail.POSTAL_ADDRESSES)) { Set postal_fds = (Set) v.get_object (); - if (!postal_fds.is_empty) - yield this._set_contact_postal_addresses (contact, - postal_fds); + yield this._set_contact_postal_addresses (contact, + postal_fds); } else if (k == Folks.PersonaStore.detail_key ( PersonaDetail.STRUCTURED_NAME)) @@ -425,8 +423,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore else if (k == Folks.PersonaStore.detail_key (PersonaDetail.URLS)) { Set urls = (Set) v.get_object (); - if (!urls.is_empty) - yield this._set_contact_urls (contact, urls); + yield this._set_contact_urls (contact, urls); } else if (k == Folks.PersonaStore.detail_key (PersonaDetail.BIRTHDAY)) { @@ -437,8 +434,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore { Set roles = (Set) v.get_object (); - if (!roles.is_empty) - yield this._set_contact_roles (contact, roles); + yield this._set_contact_roles (contact, roles); } else if (k == Folks.PersonaStore.detail_key ( PersonaDetail.IS_FAVOURITE))