[evolution/gnome-3-26] Bug 792736 - Remove false runtime warning from ml_sort_uids_by_tree()

[Milan Crha <mcrha src gnome org>]

commit 4a2a10d8a996e7da31d884c0879acd2ac85eeedf
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jan 25 09:49:36 2018 +0100

    Bug 792736 - Remove false runtime warning from ml_sort_uids_by_tree()

 src/mail/message-list.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/mail/message-list.c b/src/mail/message-list.c
index b59199d..3aa8001 100644
--- a/src/mail/message-list.c
+++ b/src/mail/message-list.c
@@ -5745,13 +5745,11 @@ ml_sort_uids_by_tree (MessageList *message_list,
 
                uid = g_ptr_array_index (uids, i);
                mi = camel_folder_get_message_info (folder, uid);
-               if (mi == NULL) {
-                       g_warning (
-                               "%s: Cannot find uid '%s' in folder '%s'",
-                               G_STRFUNC, uid,
-                               camel_folder_get_full_name (folder));
+
+               /* This can happen when the folder is updated and messages moved
+                  elsewhere or deleted while the message list regeneration is running. */
+               if (!mi)
                        continue;
-               }
 
                md = g_new0 (struct sort_message_info_data, 1);
                md->mi = mi;