aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/message-list.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2324ac7700..583fbe98ba 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-23 Not Zed <NotZed@Ximian.com>
+
+ * message-list.c (build_tree): Try turning off the BROKEN_ETREE
+ thing. It seems to work ok (better?) now, but if its still broken
+ i'll remove it again for the next release.
+
2001-01-22 Jeffrey Stedfast <fejj@ximian.com>
* mail-config-druid.c (set_defaults): Automagically fill in the
diff --git a/mail/message-list.c b/mail/message-list.c
index e78d9c8608..1c502ff9a8 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1483,7 +1483,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c
e_tree_model_node_set_expanded(etm, ml->tree_root, TRUE);
}
-#define BROKEN_ETREE /* avoid some broken code in etree(?) by not using the incremental update */
+/*#define BROKEN_ETREE*/ /* avoid some broken code in etree(?) by not using the incremental update */
top = e_tree_model_node_get_first_child(etm, ml->tree_root);
#ifndef BROKEN_ETREE
@@ -2518,8 +2518,8 @@ mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, Camel
/* see if we need to goto the child thread at all anyway */
/* currently the only case is the flat view with updates and no search */
- if (hideexpr == NULL && search == NULL && changes != NULL && !list->threaded) {
- build_flat_diff(list, changes);
+ if (hideexpr == NULL && search == NULL && changes != NULL && !ml->threaded) {
+ build_flat_diff(ml, changes);
camel_folder_change_info_free(changes);
return;
}