[evolution-ews] Show only mail messages in mail folders

[Milan Crha <mcrha src gnome org>]

commit 76d96039a33ca208f54cbeb1a693566da344a17b
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 29 12:43:06 2015 +0200

    Show only mail messages in mail folders
    
    Some folders can contain not only mail messages, but also pure
    calendar/contacts/... items, which the mail (Camel) folders do
    not operate with well, but more importantly which do not belong
    there, thus skip those items in mail folders.
    
    This is related to the evolution-list mailing list thread:
    https://mail.gnome.org/archives/evolution-list/2015-September/msg00013.html

 src/camel/camel-ews-folder.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index f62d3b9..ce14f6a 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -1422,14 +1422,17 @@ sync_updated_items (CamelEwsFolder *ews_folder,
        for (l = updated_items; l != NULL; l = g_slist_next (l)) {
                EEwsItem *item = (EEwsItem *) l->data;
                const EwsId *id;
+               EEwsItemType item_type;
                CamelMessageInfo *mi;
 
                if (!item)
                        continue;
 
                id = e_ews_item_get_id (item);
+               item_type = e_ews_item_get_item_type (item);
+
                if (!id) {
-                       g_warning ("%s: Missing ItemId for item type %d (subject:%s)", G_STRFUNC, 
e_ews_item_get_item_type (item),
+                       g_warning ("%s: Missing ItemId for item type %d (subject:%s)", G_STRFUNC, item_type,
                                e_ews_item_get_subject (item) ? e_ews_item_get_subject (item) : "???");
                        g_object_unref (item);
                        continue;
@@ -1450,9 +1453,14 @@ sync_updated_items (CamelEwsFolder *ews_folder,
                        continue;
                }
 
-               if (((CamelEwsMessageInfo *) mi)->item_type == E_EWS_ITEM_TYPE_GENERIC_ITEM)
+               if (item_type == E_EWS_ITEM_TYPE_GENERIC_ITEM)
                        generic_item_ids = g_slist_append (generic_item_ids, g_strdup (id->id));
-               else
+               else if (item_type == E_EWS_ITEM_TYPE_MESSAGE ||
+                       item_type == E_EWS_ITEM_TYPE_MEETING_REQUEST ||
+                       item_type == E_EWS_ITEM_TYPE_MEETING_MESSAGE ||
+                       item_type == E_EWS_ITEM_TYPE_MEETING_RESPONSE ||
+                       item_type == E_EWS_ITEM_TYPE_MEETING_CANCELLATION ||
+                       item_type == E_EWS_ITEM_TYPE_POST_ITEM)
                        msg_ids = g_slist_append (msg_ids, g_strdup (id->id));
 
                camel_message_info_unref (mi);
@@ -1564,7 +1572,7 @@ sync_created_items (CamelEwsFolder *ews_folder,
                        msg_ids = g_slist_append (msg_ids, g_strdup (id->id));
                else if (item_type == E_EWS_ITEM_TYPE_POST_ITEM)
                        post_item_ids = g_slist_append (post_item_ids, g_strdup (id->id));
-               else
+               else if (item_type == E_EWS_ITEM_TYPE_GENERIC_ITEM)
                        generic_item_ids = g_slist_append (generic_item_ids, g_strdup (id->id));
 
                g_object_unref (item);