From 4010ad11b4cd78d3cfa9453375310e0f8570e1dc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Mar 2013 22:06:56 +0100 Subject: Bug #645476 - Avoid scroll to cursor on folder change in message list (take 3) --- mail/message-list.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mail') diff --git a/mail/message-list.c b/mail/message-list.c index 71bc8bbe0c..0885af6ae6 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -4783,6 +4783,7 @@ regen_list_done (struct _regen_list_msg *m) if (m->dotree) { gboolean forcing_expand_state = m->ml->expand_all || m->ml->collapse_all; + ETableItem *table_item = e_tree_get_item (E_TREE (m->ml)); if (m->ml->just_set_folder) { m->ml->just_set_folder = FALSE; @@ -4796,12 +4797,19 @@ regen_list_done (struct _regen_list_msg *m) if (forcing_expand_state || searching) e_tree_force_expanded_state (tree, (m->ml->expand_all || searching) ? 1 : -1); + e_tree_memory_freeze (E_TREE_MEMORY (m->ml->model)); + build_tree (m->ml, m->tree, m->changes); if (m->ml->thread_tree) camel_folder_thread_messages_unref (m->ml->thread_tree); m->ml->thread_tree = m->tree; m->tree = NULL; + if (!m->scroll_to_cursor && table_item) + table_item->queue_show_cursor = FALSE; + + e_tree_memory_thaw (E_TREE_MEMORY (m->ml->model)); + if (forcing_expand_state || searching) { if (m->ml->folder != NULL && tree != NULL && !searching) save_tree_state (m->ml); -- cgit v1.2.3