[evolution-ews/gnome-3-20] Bug 765398 - Online GAL contacts can have incorrect email address

[Milan Crha <mcrha src gnome org>]

commit 31299ec5b97bb79bf9a5638451523ca5d4a40a2f
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 27 19:15:22 2016 +0200

    Bug 765398 - Online GAL contacts can have incorrect email address

 src/addressbook/e-book-backend-ews.c |   27 ++++++++++++++++++----
 src/server/e-ews-item.c              |   41 ++++++++++++++++++++++++++++++++++
 src/server/e-ews-item.h              |    2 +
 3 files changed, 65 insertions(+), 5 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 61880d8..1b9407e 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -586,28 +586,40 @@ static void
 set_email_address (EContact *contact,
                    EContactField field,
                    EEwsItem *item,
-                   const gchar *item_field)
+                   const gchar *item_field,
+                  gboolean require_smtp_prefix)
 {
        const gchar *ea;
 
        ea = e_ews_item_get_email_address (item, item_field);
-       if (ea && g_str_has_prefix (ea, "SMTP:"))
+       if (ea && g_ascii_strncasecmp (ea, "SMTP:", 5) == 0)
                ea = ea + 5;
+       else if (require_smtp_prefix)
+               ea = NULL;
 
        if (ea && *ea)
                e_contact_set (contact, field, ea);
 }
 
 static void
+ebews_populate_emails_ex (EBookBackendEws *ebews,
+                         EContact *contact,
+                         EEwsItem *item,
+                         gboolean require_smtp_prefix)
+{
+       set_email_address (contact, E_CONTACT_EMAIL_1, item, "EmailAddress1", require_smtp_prefix);
+       set_email_address (contact, E_CONTACT_EMAIL_2, item, "EmailAddress2", require_smtp_prefix);
+       set_email_address (contact, E_CONTACT_EMAIL_3, item, "EmailAddress3", require_smtp_prefix);
+}
+
+static void
 ebews_populate_emails (EBookBackendEws *ebews,
                       EContact *contact,
                       EEwsItem *item,
                       GCancellable *cancellable,
                       GError **errror)
 {
-       set_email_address (contact, E_CONTACT_EMAIL_1, item, "EmailAddress1");
-       set_email_address (contact, E_CONTACT_EMAIL_2, item, "EmailAddress2");
-       set_email_address (contact, E_CONTACT_EMAIL_3, item, "EmailAddress3");
+       ebews_populate_emails_ex (ebews, contact, item, FALSE);
 }
 
 static void
@@ -1252,6 +1264,7 @@ static const struct field_element_mapping {
        { E_CONTACT_SPOUSE, ELEMENT_TYPE_SIMPLE, "Profession", e_ews_item_get_profession},
        { E_CONTACT_SPOUSE, ELEMENT_TYPE_SIMPLE, "SpouseName", e_ews_item_get_spouse_name},
        { E_CONTACT_FAMILY_NAME, ELEMENT_TYPE_SIMPLE, "Surname", e_ews_item_get_surname},
+       { E_CONTACT_GIVEN_NAME, ELEMENT_TYPE_SIMPLE, "GivenName", e_ews_item_get_givenname},
        { E_CONTACT_BIRTH_DATE, ELEMENT_TYPE_COMPLEX, "WeddingAnniversary", NULL,  
ebews_populate_anniversary, ebews_set_anniversary, ebews_set_anniversary_changes },
        { E_CONTACT_PHOTO, ELEMENT_TYPE_COMPLEX, "Photo", NULL,  ebews_populate_photo, ebews_set_photo, 
ebews_set_photo_changes },
 
@@ -3434,6 +3447,10 @@ e_book_backend_ews_start_view (EBookBackend *backend,
                        e_contact_set (contact, E_CONTACT_FULL_NAME, mb->name);
 
                str = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
+               if ((!str || !*str) && contact_item && e_ews_item_get_item_type (contact_item) == 
E_EWS_ITEM_TYPE_CONTACT)
+                       ebews_populate_emails_ex (ebews, contact, contact_item, TRUE);
+
+               str = e_contact_get_const (contact, E_CONTACT_EMAIL_1);
                if (!str || !*str)
                        e_contact_set (contact, E_CONTACT_EMAIL_1, mb->email);
 
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index 9ad25ce..f73865d 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -62,6 +62,8 @@ struct _EEwsContactFields {
        gchar *spouse_name;
        gchar *culture;
        gchar *surname;
+       gchar *givenname;
+       gchar *middlename;
        gchar *notes;
 };
 
@@ -345,6 +347,8 @@ ews_free_contact_fields (struct _EEwsContactFields *con_fields)
                g_free (con_fields->spouse_name);
                g_free (con_fields->culture);
                g_free (con_fields->surname);
+               g_free (con_fields->givenname);
+               g_free (con_fields->middlename);
                g_free (con_fields->notes);
                g_free (con_fields);
        }
@@ -797,6 +801,10 @@ parse_contact_field (EEwsItem *item,
                priv->contact_fields->spouse_name = e_soap_parameter_get_string_value (subparam);
        } else if (!g_ascii_strcasecmp (name, "Surname")) {
                priv->contact_fields->surname = e_soap_parameter_get_string_value (subparam);
+       } else if (!g_ascii_strcasecmp (name, "GivenName")) {
+               priv->contact_fields->givenname = e_soap_parameter_get_string_value (subparam);
+       } else if (!g_ascii_strcasecmp (name, "MiddleName")) {
+               priv->contact_fields->middlename = e_soap_parameter_get_string_value (subparam);
        } else if (!g_ascii_strcasecmp (name, "WeddingAnniversary")) {
                value = e_soap_parameter_get_string_value (subparam);
                priv->contact_fields->wedding_anniversary = ews_item_parse_date (value);
@@ -1859,6 +1867,21 @@ e_ews_item_get_complete_name (EEwsItem *item)
        g_return_val_if_fail (E_IS_EWS_ITEM (item), NULL);
        g_return_val_if_fail (item->priv->contact_fields != NULL, NULL);
 
+       if (!item->priv->contact_fields->complete_name && (
+           item->priv->contact_fields->surname ||
+           item->priv->contact_fields->middlename ||
+           item->priv->contact_fields->givenname)) {
+               EwsCompleteName *cn;
+
+               cn = g_new0 (EwsCompleteName, 1);
+
+               cn->first_name = g_strdup (item->priv->contact_fields->givenname);
+               cn->middle_name = g_strdup (item->priv->contact_fields->middlename);
+               cn->last_name = g_strdup (item->priv->contact_fields->surname);
+
+               item->priv->contact_fields->complete_name = cn;
+       }
+
        return (const EwsCompleteName *) item->priv->contact_fields->complete_name;
 }
 
@@ -2057,6 +2080,24 @@ e_ews_item_get_surname (EEwsItem *item)
 }
 
 const gchar *
+e_ews_item_get_givenname (EEwsItem *item)
+{
+       g_return_val_if_fail (E_IS_EWS_ITEM (item), NULL);
+       g_return_val_if_fail (item->priv->contact_fields != NULL, NULL);
+
+       return item->priv->contact_fields->givenname;
+}
+
+const gchar *
+e_ews_item_get_middlename (EEwsItem *item)
+{
+       g_return_val_if_fail (E_IS_EWS_ITEM (item), NULL);
+       g_return_val_if_fail (item->priv->contact_fields != NULL, NULL);
+
+       return item->priv->contact_fields->middlename;
+}
+
+const gchar *
 e_ews_item_get_notes (EEwsItem *item)
 {
        g_return_val_if_fail (E_IS_EWS_ITEM (item), NULL);
diff --git a/src/server/e-ews-item.h b/src/server/e-ews-item.h
index 304d542..03b43f3 100644
--- a/src/server/e-ews-item.h
+++ b/src/server/e-ews-item.h
@@ -323,6 +323,8 @@ const gchar *       e_ews_item_get_profession       (EEwsItem *item);
 const gchar *  e_ews_item_get_spouse_name      (EEwsItem *item);
 const gchar *  e_ews_item_get_culture          (EEwsItem *item);
 const gchar *  e_ews_item_get_surname          (EEwsItem *item);
+const gchar *  e_ews_item_get_givenname        (EEwsItem *item);
+const gchar *  e_ews_item_get_middlename       (EEwsItem *item);
 const gchar *  e_ews_item_get_notes            (EEwsItem *item);
 
 /*Task fields*/