[evolution-ews/gnome-3-22] Bug 777946 - Fails to import regular appointment

[Milan Crha <mcrha src gnome org>]

commit 294142fc48e7fb5b55948aee2959c13a8a90aabd
Author: Milan Crha <mcrha redhat com>
Date:   Mon Feb 6 14:07:57 2017 +0100

    Bug 777946 - Fails to import regular appointment

 src/calendar/e-cal-backend-ews.c |   49 +++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 9 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index ded9c57..9b6eb32 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -2339,6 +2339,23 @@ e_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
        const gchar *attendee_str = NULL, *attendee_mail = NULL;
        gint attendees_count = 0;
        const gchar *response = NULL;
+       gboolean found = FALSE;
+
+       attendee = icalcomponent_get_first_property (icalcomp, ICAL_ORGANIZER_PROPERTY);
+       if (attendee) {
+               attendee_str = icalproperty_get_organizer (attendee);
+
+               if (attendee_str) {
+                       if (!strncasecmp (attendee_str, "MAILTO:", 7))
+                               attendee_mail = attendee_str + 7;
+                       else
+                               attendee_mail = attendee_str;
+                       if (attendee_mail && current_user_mail && g_ascii_strcasecmp (attendee_mail, 
current_user_mail) == 0) {
+                               /* Empty string means it's an organizer, NULL is when not found */
+                               return "";
+                       }
+               }
+       }
 
        for (attendee = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
                attendee != NULL;
@@ -2350,19 +2367,22 @@ e_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
                                attendee_mail = attendee_str + 7;
                        else
                                attendee_mail = attendee_str;
-                       if (attendee_mail && current_user_mail && g_ascii_strcasecmp (attendee_mail, 
current_user_mail) == 0)
-                               return icalproperty_get_parameter_as_string (attendee, "PARTSTAT");
+                       if (attendee_mail && current_user_mail && g_ascii_strcasecmp (attendee_mail, 
current_user_mail) == 0) {
+                               response = icalproperty_get_parameter_as_string (attendee, "PARTSTAT");
+                               found = TRUE;
+                       }
                }
        }
 
        /* this should not happen, but if the user's configured email does not match the one
           used in the invitation, like when the invitation comes to a mailing list... */
-       if (attendees_count == 1) {
+       if (!found && attendees_count == 1) {
                attendee = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
                g_return_val_if_fail (attendee != NULL, NULL);
 
-               return icalproperty_get_parameter_as_string (attendee, "PARTSTAT");
-       } else {
+               response = icalproperty_get_parameter_as_string (attendee, "PARTSTAT");
+               found = TRUE;
+       } else if (!found) {
                ESourceRegistry *registry;
                ECalComponent *comp;
 
@@ -2377,8 +2397,10 @@ e_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
                        if (!attendee)
                                attendee = find_attendee_if_sentby (icalcomp, my_address);
 
-                       if (attendee)
+                       if (attendee) {
                                response = icalproperty_get_parameter_as_string (attendee, "PARTSTAT");
+                               found = TRUE;
+                       }
 
                        g_free (my_address);
                }
@@ -2386,6 +2408,10 @@ e_ews_get_current_user_meeting_reponse (ECalBackendEws *cbews,
                g_object_unref (comp);
        }
 
+       if (found && !response) {
+               response = "NEEDS-ACTION";
+       }
+
        return response;
 }
 
@@ -2404,16 +2430,21 @@ ews_cal_do_method_request_publish_reply (ECalBackendEws *cbews,
        gint pass = 0;
        GSList *ids = NULL;
 
-       if (!response_type) {
+       if (!response_type &&
+           e_cal_util_component_has_organizer (subcomp) &&
+           e_cal_util_component_has_attendee (subcomp)) {
                g_set_error (error, E_DATA_CAL_ERROR, UnknownUser, _("Cannot find user '%s' between 
attendees"), cbews->priv->user_email ? cbews->priv->user_email : "NULL");
                return;
        }
 
-       ews_cal_component_get_calendar_item_accept_id (comp, &item_id, &change_key, &mail_id);
+       if (response_type && *response_type)
+               ews_cal_component_get_calendar_item_accept_id (comp, &item_id, &change_key, &mail_id);
+       else
+               response_type = NULL;
 
        while (pass < 2) {
                /*in case we do not have item id we will create item with mime content only*/
-               if (item_id == NULL) {
+               if (!item_id || (response_type && g_ascii_strcasecmp (response_type, "NEEDS-ACTION") == 0)) {
                        e_ews_receive_objects_no_exchange_mail (cbews, subcomp, &ids, cancellable, 
&local_error);
                } else {
                        EwsCalendarConvertData convert_data = { 0 };