[folks] eds: Revert checks for empty properties
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] eds: Revert checks for empty properties
- Date: Sat, 23 Jun 2012 11:17:48 +0000 (UTC)
commit be138e709d9d01c60a09bc7ed2c431a6205b5fcd
Author: Philip Withnall <philip tecnocode co uk>
Date: Sat Jun 23 12:04:38 2012 +0100
eds: Revert checks for empty properties
These are in the wrong place and duplicate checks further down those code
paths.
backends/eds/lib/edsf-persona-store.vala | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
---
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<PhoneFieldDetails> phone_numbers =
(Set<PhoneFieldDetails>) 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<PostalAddressFieldDetails> postal_fds =
(Set<PostalAddressFieldDetails>) 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<UrlFieldDetails> urls = (Set<UrlFieldDetails>) 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<RoleFieldDetails> roles =
(Set<RoleFieldDetails>) 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))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]