diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/summaryview.c | 7 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2005-06-03 + + * src/summaryview.c: summary_junk_func(), summary_junk(): allow + empty junk folder. + 2005-06-02 * src/prefs_common.c: prefs_font_select(): select current font diff --git a/ChangeLog.ja b/ChangeLog.ja index 8e9cacee..05220344 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2005-06-03 + + * src/summaryview.c: summary_junk_func(), summary_junk(): 空の + junk フォルダを許可するようにした。 + 2005-06-02 * src/prefs_common.c: prefs_font_select(): ダイアログを開く時に 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); |