aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog15
-rw-r--r--mail/folder-browser.c16
-rw-r--r--mail/message-list.c2
3 files changed, 24 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 2c9faed0af..ee4c8c4d6f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,18 @@
+2001-01-26 Not Zed <NotZed@Ximian.com>
+
+ * message-list.c (build_tree): Define BROKEN_ETREE again, till we
+ get this stuff fixed better.
+
+2001-01-25 Not Zed <NotZed@Ximian.com>
+
+ * folder-browser.c: Moved teh "sender contains" item to the end of
+ the list, so the gui doesn't suddenly change on everyone. Fixed
+ the sender-contains search string to be a valid s-exp (ha, didn't
+ test it even once eh ettore?!)
+ (search_save): Dont have the sender contains as the default case
+ (which well, never gets called anyway), oops i guess i should've
+ reviewed the patch a little more.
+
2001-01-26 Ettore Perazzoli <ettore@ximian.com>
* folder-browser.c: Add a missing parenthesis to the "from
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index d7f70e4a64..e3903fab3e 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -330,14 +330,6 @@ search_save (GtkWidget *w, FolderBrowser *fb)
default:
/* header or body contains */
index = ESB_BODY_SUBJECT_CONTAINS;
- case ESB_SENDER_CONTAINS:
- part = vfolder_create_part ("from");
- filter_rule_add_part ((FilterRule *)rule, part);
- element = filter_part_find_element (part, "from-type");
- filter_option_set_current ((FilterOption *)element, "contains");
- element = filter_part_find_element (part, "from");
- filter_input_set_value ((FilterInput *)element, text);
- break;
case ESB_BODY_CONTAINS:
case ESB_SUBJECT_CONTAINS:
if (index == ESB_BODY_SUBJECT_CONTAINS || index == ESB_BODY_CONTAINS) {
@@ -374,6 +366,14 @@ search_save (GtkWidget *w, FolderBrowser *fb)
element = filter_part_find_element (part, "subject");
filter_input_set_value ((FilterInput *)element, text);
break;
+ case ESB_SENDER_CONTAINS:
+ part = vfolder_create_part ("from");
+ filter_rule_add_part ((FilterRule *)rule, part);
+ element = filter_part_find_element (part, "from-type");
+ filter_option_set_current ((FilterOption *)element, "contains");
+ element = filter_part_find_element (part, "from");
+ filter_input_set_value ((FilterInput *)element, text);
+ break;
}
vfolder_gui_add_rule (rule);
diff --git a/mail/message-list.c b/mail/message-list.c
index 46e3b772a5..9ce7d18aef 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