From: Philip Withnall <philip@tecnocode.co.uk>
Date: Mon, 9 Jan 2012 11:16:09 +0000 (+0000)
Subject: eds: Mark a few more contact fields as being handled
X-Git-Tag: FOLKS_0_6_7~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93a0fa7049f9a94ff917fa3bba24b376257a7c2b;p=platform%2Fupstream%2Ffolks.git

eds: Mark a few more contact fields as being handled

This should prevent a few debug messages about unhandled fields.
---

diff --git a/backends/eds/lib/edsf-persona-store.vala b/backends/eds/lib/edsf-persona-store.vala
index bb63a19..0bdcb7d 100644
--- a/backends/eds/lib/edsf-persona-store.vala
+++ b/backends/eds/lib/edsf-persona-store.vala
@@ -1003,6 +1003,7 @@ public class Edsf.PersonaStore : Folks.PersonaStore
             return PersonaDetail.FULL_NAME;
           case ContactField.GIVEN_NAME:
           case ContactField.FAMILY_NAME:
+          case ContactField.NAME:
             return PersonaDetail.STRUCTURED_NAME;
           case ContactField.NICKNAME:
             return PersonaDetail.NICKNAME;
@@ -1116,23 +1117,31 @@ public class Edsf.PersonaStore : Folks.PersonaStore
           case ContactField.IM_SKYPE_WORK_2:
           case ContactField.IM_SKYPE_WORK_3:
           case ContactField.IM_SKYPE:
+          case ContactField.IM_GOOGLE_TALK_HOME_1:
+          case ContactField.IM_GOOGLE_TALK_HOME_2:
+          case ContactField.IM_GOOGLE_TALK_HOME_3:
+          case ContactField.IM_GOOGLE_TALK_WORK_1:
+          case ContactField.IM_GOOGLE_TALK_WORK_2:
+          case ContactField.IM_GOOGLE_TALK_WORK_3:
+          case ContactField.IM_GOOGLE_TALK:
             return PersonaDetail.IM_ADDRESSES;
           case ContactField.PHOTO:
             return PersonaDetail.AVATAR;
           case ContactField.BIRTH_DATE:
             return PersonaDetail.BIRTHDAY;
+          /* Irrelevant */
+          case ContactField.UID: /* identifier */
+          case ContactField.REV: /* revision date */
+          case ContactField.BOOK_URI: /* parent identifier */
+          case ContactField.NAME_OR_ORG: /* FULL_NAME or ORG; both handled */
+            return PersonaDetail.INVALID;
           /* Unsupported */
-          case ContactField.UID:
           case ContactField.FILE_AS:
-          case ContactField.BOOK_URI:
           case ContactField.MAILER:
           case ContactField.CALENDAR_URI:
           case ContactField.ICS_CALENDAR:
           case ContactField.SPOUSE:
-          case ContactField.REV:
-          case ContactField.NAME_OR_ORG:
           case ContactField.LOGO:
-          case ContactField.NAME:
           case ContactField.WANTS_HTML:
           case ContactField.IS_LIST:
           case ContactField.LIST_SHOW_ADDRESSES: