From 2ff5e443e10893725aa0ffbb71d3104f1f196330 Mon Sep 17 00:00:00 2001 From: hiro Date: Fri, 3 Jun 2005 05:28:44 +0000 Subject: allow empty junk folder setting. git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@308 ee746299-78ed-0310-b773-934348b2243d --- src/summaryview.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/summaryview.c b/src/summaryview.c index ddcf86e9..4cee6e8c 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3691,7 +3691,8 @@ static void summary_junk_func(GtkTreeModel *model, GtkTreePath *path, action2.str_value = prefs_common.junk_folder; rule.action_list = g_slist_append(rule.action_list, &action1); - rule.action_list = g_slist_append(rule.action_list, &action2); + if (prefs_common.junk_folder) + rule.action_list = g_slist_append(rule.action_list, &action2); fltinfo = filter_info_new(); @@ -3736,7 +3737,7 @@ void summary_junk(SummaryView *summaryview) { if (!prefs_common.enable_junk) return; - if (!prefs_common.junk_learncmd || !prefs_common.junk_folder) + if (!prefs_common.junk_learncmd) return; summary_lock(summaryview); @@ -3748,7 +3749,7 @@ void summary_junk(SummaryView *summaryview) summary_unlock(summaryview); - if (prefs_common.immediate_exec) + if (prefs_common.junk_folder && prefs_common.immediate_exec) summary_execute(summaryview); else { summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); -- cgit v1.2.3