diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-04 21:08:32 +0800 |
| commit | c3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch) | |
| tree | 677c9472380b3119d08f42eb48c001d18bfd6243 /mail/message-list.c | |
| parent | 5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff) | |
| parent | fb970ccf14e33d92cfb9409d44f7b06355e958fc (diff) | |
| download | gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.bz2 gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.lz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.xz gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.zst gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.zip | |
Merge branch 'master' into kill-bonobo
Conflicts:
addressbook/gui/Makefile.am
addressbook/gui/widgets/Makefile.am
addressbook/gui/widgets/eab-popup-control.c
calendar/gui/e-meeting-time-sel.c
calendar/gui/migration.c
calendar/modules/e-memo-shell-module-migrate.h
e-util/e-logger.c
mail/e-mail-attachment-bar.c
mail/em-composer-utils.c
mail/em-format-html-display.c
plugins/mail-account-disable/Makefile.am
plugins/select-one-source/Makefile.am
po/es.po
shell/Makefile.am
shell/e-shell-common.h
shell/e-shell-nm.c
shell/e-shell-window-commands.c
shell/e-shell-window.c
shell/e-sidebar.c
shell/e-user-creatable-items-handler.c
shell/importer/Makefile.am
shell/test/Makefile.am
widgets/misc/test-error.c
widgets/misc/test-info-label.c
widgets/misc/test-multi-config-dialog.c
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 11d0f19707..39784acfcc 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2760,7 +2760,7 @@ clear_info(char *key, ETreePath *node, MessageList *ml) } static void -clear_tree (MessageList *ml) +clear_tree (MessageList *ml, gboolean tfree) { ETreeModel *etm = ml->model; @@ -2784,7 +2784,8 @@ clear_tree (MessageList *ml) } ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL); - + if (tfree) + e_tree_model_rebuilt (E_TREE_MODEL(etm)); #ifdef TIMEIT gettimeofday(&end, NULL); diff = end.tv_sec * 1000 + end.tv_usec/1000; @@ -2945,7 +2946,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c selected = message_list_get_selected(ml); #endif e_tree_memory_freeze(E_TREE_MEMORY(etm)); - clear_tree (ml); + clear_tree (ml, FALSE); build_subtree(ml, ml->tree_root, thread->tree, &row); e_tree_memory_thaw(E_TREE_MEMORY(etm)); @@ -3264,7 +3265,7 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) selected = message_list_get_selected(ml); #endif e_tree_memory_freeze(E_TREE_MEMORY(etm)); - clear_tree (ml); + clear_tree (ml, FALSE); for (i = 0; i < summary->len; i++) { ETreePath node; CamelMessageInfo *info = summary->pdata[i]; @@ -3530,7 +3531,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c } e_tree_memory_freeze(E_TREE_MEMORY(etm)); - clear_tree (message_list); + clear_tree (message_list, TRUE); e_tree_memory_thaw(E_TREE_MEMORY(etm)); if (message_list->folder) { |