diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-06 05:03:00 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-04-06 05:03:00 +0000 |
commit | beedd408b15d15073d135252043fd47d421f4ab4 (patch) | |
tree | e8ee2290f3399ffa09d1efd347b413ca99eac7ed /src | |
parent | 2dd04f6bc82e5242566c0c829ef50a35f00f4c98 (diff) |
display error dialog if the execution of the junk filter command failed.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1597 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'src')
-rw-r--r-- | src/inc.c | 16 | ||||
-rw-r--r-- | src/summaryview.c | 8 |
2 files changed, 24 insertions, 0 deletions
@@ -1214,6 +1214,14 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file) filter_apply(prefs_common.junk_fltlist, file, fltinfo); if (fltinfo->drop_done) is_junk = TRUE; + else if (fltinfo->error == FLT_ERROR_EXEC_FAILED) { + alertpanel_error + (_("Execution of the junk filter command failed.\n" + "Please check the junk mail control setting.")); + filter_info_free(fltinfo); + inc_session->inc_state = INC_ERROR; + return DROP_ERROR; + } } if (!fltinfo->drop_done && session->ac_prefs->filter_on_recv) @@ -1226,6 +1234,14 @@ static gint inc_drop_message(Pop3Session *session, const gchar *file) filter_apply(prefs_common.junk_fltlist, file, fltinfo); if (fltinfo->drop_done) is_junk = TRUE; + else if (fltinfo->error == FLT_ERROR_EXEC_FAILED) { + alertpanel_error + (_("Execution of the junk filter command failed.\n" + "Please check the junk mail control setting.")); + filter_info_free(fltinfo); + inc_session->inc_state = INC_ERROR; + return DROP_ERROR; + } } } diff --git a/src/summaryview.c b/src/summaryview.c index 368eacac..e74fe4a5 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -4465,6 +4465,14 @@ static gboolean summary_filter_junk_func(GtkTreeModel *model, GtkTreePath *path, fltinfo->actions[FLT_ACTION_DELETE] || fltinfo->actions[FLT_ACTION_MARK_READ]) summaryview->filtered++; + else if (fltinfo->error == FLT_ERROR_EXEC_FAILED) { + if (summaryview->flt_count == 1) { + alertpanel_error + (_("Execution of the junk filter command failed.\n" + "Please check the junk mail control setting.")); + } + return TRUE; + } if (msginfo->flags.perm_flags != fltinfo->flags.perm_flags) { msginfo->flags = fltinfo->flags; |