aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-folder-tree.c1
-rw-r--r--mail/em-vfolder-rule.c1
3 files changed, 6 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 31b684e385..710208c5b4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-29 Not Zed <NotZed@Ximian.com>
+
+ * em-vfolder-rule.c (source_add): setup exclusion for vfolder
+ sources, noselect folders. Bug #60794.
+
2004-06-23 Jeffrey Stedfast <fejj@novell.com>
* em-folder-selector.c (em_folder_selector_get_selected_path):
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index eb1cf9bffe..e99da52814 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -334,7 +334,6 @@ emft_select_func(GtkTreeSelection *selection, GtkTreeModel *model, GtkTreePath *
GtkTreeIter iter;
/* NB: This will be called with selection==NULL from tree_row_activated */
-
if (emft->priv->excluded == 0)
return TRUE;
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index fc8532eba0..24cc3f390c 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -489,6 +489,7 @@ source_add(GtkWidget *widget, struct _source_data *data)
GtkWidget *dialog;
emft =(EMFolderTree *)em_folder_tree_new_with_model(mail_component_peek_tree_model(mail_component_peek()));
+ em_folder_tree_set_excluded(emft, EMFT_EXCLUDE_NOSELECT);
dialog = em_folder_selector_new(emft, EM_FOLDER_SELECTOR_CAN_CREATE, _("Select Folder"), NULL, _("_Add"));
gtk_window_set_transient_for((GtkWindow *)dialog, (GtkWindow *)gtk_widget_get_toplevel(widget));