[evolution/gnome-3-22] Message list not always scrolled to the cursor position on folder enter ][

[Milan Crha <mcrha src gnome org>]

commit 9ea53b38bb89e2ab9ba01a3ef3bbd38db835f876
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 24 16:05:19 2016 +0100

    Message list not always scrolled to the cursor position on folder enter ][
    
    The first attempt wasn't enough, more changes were needed.

 mail/message-list.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/mail/message-list.c b/mail/message-list.c
index 90e335e..b585975 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4637,8 +4637,13 @@ message_list_folder_changed (CamelFolder *folder,
                }
        }
 
-       if (need_list_regen)
-               mail_regen_list (message_list, NULL, TRUE);
+       if (need_list_regen) {
+               /* Use 'folder_changed = TRUE' only if this is not the first change after the folder
+                  had been set. There could happen a race condition on folder enter which prevented
+                  the message list to scroll to the cursor position due to the folder_changed = TRUE,
+                  by cancelling the full rebuild request. */
+               mail_regen_list (message_list, NULL, !message_list->just_set_folder);
+       }
 
        if (altered_changes != NULL)
                camel_folder_change_info_free (altered_changes);