aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-junk-hook.c44
-rw-r--r--mail/em-junk-hook.h5
-rw-r--r--mail/mail.error.xml13
-rw-r--r--plugins/bogo-junk-plugin/ChangeLog8
-rw-r--r--plugins/bogo-junk-plugin/bf-junk-filter.c26
-rw-r--r--plugins/sa-junk-plugin/ChangeLog13
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c69
8 files changed, 151 insertions, 38 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 62bda655cc..8e3a8ba172 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2008-04-25 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #273041
+
+ * mail.error.xml: (junk-check-error), (junk-report-error),
+ (junk-not-report-error): New error messages added.
+ * em-junk-hook.h: (struct _EMJunkHookTarget), (em_junk_error_quark):
+ * em-junk-hook.c: (manage_error), (em_junk_check_junk),
+ (em_junk_report_junk), (em_junk_report_non_junk):
+ Allow propagation of the error from the plugin in the hook target.
+
2008-04-23 Milan Crha <mcrha@redhat.com>
* em-format-html-display.c: (efhd_update_bar):
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index ee4a6ed614..24341c960f 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -30,6 +30,8 @@
#include "em-junk-hook.h"
#include "mail-session.h"
#include <e-util/e-icon-factory.h>
+#include "e-util/e-error.h"
+#include "em-utils.h"
#include <camel/camel-junk-plugin.h>
#include <glib/gi18n.h>
@@ -61,6 +63,15 @@ static const EPluginHookTargetKey emjh_flag_map[] = {
</hook>
*/
+
+static void manage_error (const char *msg, GError *error);
+
+GQuark
+em_junk_error_quark (void)
+{
+ return g_quark_from_static_string ("em-junk-error-quark");
+}
+
static const char *
em_junk_get_name (CamelJunkPlugin *csp);
@@ -90,11 +101,17 @@ em_junk_check_junk(CamelJunkPlugin *csp, CamelMimeMessage *m)
struct _EMJunkHookItem *item = (EMJunkHookItem *)csp;
if (item->hook && item->hook->hook.plugin->enabled) {
+ gboolean res;
EMJunkHookTarget target = {
- m
+ m,
+ NULL
};
- return e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target) != NULL;
+ res = e_plugin_invoke(item->hook->hook.plugin, item->check_junk, &target) != NULL;
+
+ manage_error ("mail:junk-check-error", target.error);
+
+ return res;
}
return FALSE;
@@ -107,10 +124,13 @@ em_junk_report_junk(CamelJunkPlugin *csp, CamelMimeMessage *m)
if (item->hook && item->hook->hook.plugin->enabled) {
EMJunkHookTarget target = {
- m
+ m,
+ NULL
};
e_plugin_invoke(item->hook->hook.plugin, item->report_junk, &target);
+
+ manage_error ("mail:junk-report-error", target.error);
}
}
@@ -121,9 +141,11 @@ em_junk_report_non_junk(CamelJunkPlugin *csp, CamelMimeMessage *m)
if (item->hook && item->hook->hook.plugin->enabled) {
EMJunkHookTarget target = {
- m
+ m,
+ NULL
};
e_plugin_invoke(item->hook->hook.plugin, item->report_non_junk, &target);
+ manage_error ("mail:junk-not-report-error", target.error);
}
}
@@ -279,6 +301,20 @@ emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
return 0;
}
+static void
+manage_error (const char *msg, GError *error)
+{
+ GtkWidget *w;
+
+ if (!error)
+ return;
+
+ w = e_error_new (NULL, msg, error->message, NULL);
+ em_utils_show_error_silent (w);
+
+ g_error_free (error);
+}
+
/*XXX: don't think we need here*/
static void
emjh_enable(EPluginHook *eph, int state)
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 952c0b914e..940607e323 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -43,8 +43,13 @@ typedef struct _EMJunkHookTarget EMJunkHookTarget;
typedef void (*EMJunkHookFunc)(struct _EPlugin *plugin, EMJunkHookTarget *data);
+GQuark em_junk_error_quark (void);
+
+#define EM_JUNK_ERROR em_junk_error_quark ()
+
struct _EMJunkHookTarget {
struct _CamelMimeMessage *m;
+ GError *error;
};
struct _EMJunkHookItem {
diff --git a/mail/mail.error.xml b/mail/mail.error.xml
index e8ce35614d..9caf7158a6 100644
--- a/mail/mail.error.xml
+++ b/mail/mail.error.xml
@@ -411,6 +411,19 @@ You can choose to ignore this folder, overwrite or append its contents, or quit.
<_secondary xml:space="preserve">You do not have sufficient permissions to delete this mail.</_secondary>
</error>
+ <error id="junk-check-error" type="error">
+ <_primary>Check Junk Failed</_primary>
+ <_secondary xml:space="preserve">{0}</_secondary>
+ </error>
+
+ <error id="junk-report-error" type="error">
+ <_primary>Report Junk Failed</_primary>
+ <_secondary xml:space="preserve">{0}</_secondary>
+ </error>
+ <error id="junk-not-report-error" type="error">
+ <_primary>Report Not Junk Failed</_primary>
+ <_secondary xml:space="preserve">{0}</_secondary>
+ </error>
</error-list>
diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog
index c40590a97e..4fc625aee7 100644
--- a/plugins/bogo-junk-plugin/ChangeLog
+++ b/plugins/bogo-junk-plugin/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-25 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #273041
+
+ * bf-junk-filter.c: (pipe_to_bogofilter), (em_junk_bf_check_junk),
+ (em_junk_bf_report_junk), (em_junk_bf_report_non_junk):
+ Propagate possible errors to the UI.
+
2008-03-19 Sankar P <psankar@novell.com>
** Fix for bug #519304
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 3e0758e14c..4cfbd5deca 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -73,9 +73,8 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable);
static gboolean em_junk_bf_unicode = TRUE;
-
static gint
-pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv)
+pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv, GError **error)
{
GPid child_pid;
gint bf_in;
@@ -83,6 +82,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv)
GError *err = NULL;
gint status;
gint waitres;
+ gint res;
if (camel_debug_start ("junk")) {
int i;
@@ -110,6 +110,9 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv)
g_warning ("error occurred while spawning %s: %s",
argv[0],
err->message);
+ /* For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself. */
+ g_set_error (error, EM_JUNK_ERROR, err->code, _("Error occurred while spawning %s: %s."), argv[0], err->message);
+
return BOGOFILTER_ERROR;
}
@@ -132,16 +135,23 @@ pipe_to_bogofilter (CamelMimeMessage *msg, gchar **argv)
kill (child_pid, SIGKILL);
sleep (1);
waitres = waitpid (child_pid, &status, WNOHANG);
- }
+ g_set_error (error, EM_JUNK_ERROR, -2, _("Bogofilter child process does not respond, killing..."));
+ } else
+ g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating..."));
}
g_spawn_close_pid (child_pid);
if (waitres >= 0 && WIFEXITED (status)) {
- return WEXITSTATUS (status);
+ res = WEXITSTATUS (status);
} else {
- return BOGOFILTER_ERROR;
+ res = BOGOFILTER_ERROR;
}
+
+ if (res != 0)
+ g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
+
+ return res;
}
static void
@@ -190,7 +200,7 @@ em_junk_bf_check_junk (EPlugin *ep, EMJunkHookTarget *target)
argv[1] = "--unicode=yes";
}
- rv = pipe_to_bogofilter (msg, argv);
+ rv = pipe_to_bogofilter (msg, argv, &target->error);
d(fprintf (stderr, "em_junk_bf_check_junk rv = %d\n", rv));
@@ -215,7 +225,7 @@ em_junk_bf_report_junk (EPlugin *ep, EMJunkHookTarget *target)
argv[2] = "--unicode=yes";
}
- pipe_to_bogofilter (msg, argv);
+ pipe_to_bogofilter (msg, argv, &target->error);
}
void
@@ -236,7 +246,7 @@ em_junk_bf_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
argv[2] = "--unicode=yes";
}
- pipe_to_bogofilter (msg, argv);
+ pipe_to_bogofilter (msg, argv, &target->error);
}
void
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index 0ad3407ce7..890709261a 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-25 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #273041
+
+ * em-junk-filter.c: (em_junk_sa_commit_reports),
+ (em_junk_sa_validate_binary): Fix function prototype.
+ * em-junk-filter.c: (pipe_to_sa_full), (em_junk_sa_test_spamd_running),
+ (em_junk_sa_test_spamassassin), (pipe_to_sa), (em_junk_sa_run_spamd),
+ (em_junk_sa_test_spamd), (em_junk_sa_is_available),
+ (em_junk_sa_check_junk), (get_spamassassin_version),
+ (em_junk_sa_report_junk), (em_junk_sa_report_non_junk):
+ Propagate possible errors to the UI.
+
2008-03-13 Milan Crha <mcrha@redhat.com>
** Fix for bug #515786
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 4e455e9b8e..592f78ba4a 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -64,8 +64,8 @@ int e_plugin_lib_enable (EPluginLib *ep, int enable);
gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
-void em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target);
-void *em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target);
+void em_junk_sa_commit_reports (EPlugin *ep);
+void *em_junk_sa_validate_binary (EPlugin *ep);
GtkWidget *org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
static void em_junk_sa_init (void);
@@ -110,7 +110,7 @@ em_junk_sa_get_name (void)
#endif
static int
-pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer)
+pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error)
{
int result, status, errnosav, fds[2], out_fds[2];
CamelStream *stream;
@@ -131,6 +131,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
program = g_find_program_in_path (argv [0]);
if (program == NULL) {
d(printf ("program not found, returning %d\n", rv_err));
+ g_set_error (error, EM_JUNK_ERROR, rv_err, _("SpamAssassin not found, code: %d"), rv_err);
return rv_err;
}
g_free (program);
@@ -138,6 +139,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
if (pipe (fds) == -1) {
errnosav = errno;
d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+ g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
errno = errnosav;
return rv_err;
}
@@ -145,6 +147,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
if (output_buffer && pipe (out_fds) == -1) {
errnosav = errno;
d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
+ g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav));
close (fds [0]);
close (fds [1]);
errno = errnosav;
@@ -182,6 +185,8 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
close (out_fds [0]);
close (out_fds [1]);
}
+ if (errnosav != 0 && errnosav != -1)
+ g_set_error (error, EM_JUNK_ERROR, errnosav, _("Error after fork: %s"), strerror (errnosav));
errno = errnosav;
return rv_err;
}
@@ -219,6 +224,8 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
}
if (wait_for_termination) {
+ int res;
+
d(printf ("wait for child %d termination\n", pid));
result = waitpid (pid, &status, 0);
@@ -234,21 +241,28 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
kill (pid, SIGKILL);
sleep (1);
result = waitpid (pid, &status, WNOHANG);
- }
+ g_set_error (error, EM_JUNK_ERROR, -2, _("SpamAssassin child process does not respond, killing..."));
+ } else
+ g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Spamassassin child process interrupted, terminating..."));
}
if (result != -1 && WIFEXITED (status))
- return WEXITSTATUS (status);
+ res = WEXITSTATUS (status);
else
- return rv_err;
+ res = rv_err;
+
+ if (res != 0)
+ g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res);
+
+ return res;
} else
return 0;
}
static int
-pipe_to_sa (CamelMimeMessage *msg, const char *in, char **argv)
+pipe_to_sa (CamelMimeMessage *msg, const char *in, char **argv, GError **error)
{
- return pipe_to_sa_full (msg, in, argv, -1, 1, NULL);
+ return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error);
}
static char *
@@ -281,7 +295,7 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system)
argv[i] = NULL;
- rv = pipe_to_sa (NULL, "From test@127.0.0.1", argv) == 0;
+ rv = pipe_to_sa (NULL, "From test@127.0.0.1", argv, NULL) == 0;
d(fprintf (stderr, "result: %d (%s)\n", rv, rv ? "success" : "failed"));
@@ -299,7 +313,7 @@ em_junk_sa_test_spamassassin (void)
NULL,
};
- if (pipe_to_sa (NULL, NULL, argv) != 0)
+ if (pipe_to_sa (NULL, NULL, argv, NULL) != 0)
em_junk_sa_available = FALSE;
else
em_junk_sa_available = TRUE;
@@ -337,7 +351,7 @@ em_junk_sa_run_spamd (char *binary)
d(fprintf (stderr, "trying to run %s with socket path %s\n", binary, em_junk_sa_get_socket_path ()));
- if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL)) {
+ if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL, NULL)) {
struct timespec time_req;
struct stat stat_buf;
@@ -427,7 +441,7 @@ em_junk_sa_test_spamd (void)
argv [i++] = "ps ax|grep -v grep|grep -E 'spamd.*(\\-L|\\-\\-local)'|grep -E -v '\\ \\-p\\ |\\ \\-\\-port\\ '";
argv[i] = NULL;
- if (pipe_to_sa (NULL, NULL, argv) != 0) {
+ if (pipe_to_sa (NULL, NULL, argv, NULL) != 0) {
try_system_spamd = FALSE;
d(fprintf (stderr, "there's no system spamd with -L/--local parameter running\n"));
}
@@ -470,7 +484,7 @@ em_junk_sa_test_spamd (void)
}
static gboolean
-em_junk_sa_is_available (void)
+em_junk_sa_is_available (GError **error)
{
pthread_mutex_lock (&em_junk_sa_init_lock);
@@ -480,6 +494,9 @@ em_junk_sa_is_available (void)
if (em_junk_sa_available && !em_junk_sa_spamd_tested && em_junk_sa_use_daemon)
em_junk_sa_test_spamd ();
+ if (!em_junk_sa_available)
+ g_set_error (error, EM_JUNK_ERROR, 1, _("SpamAssassin is not available."));
+
pthread_mutex_unlock (&em_junk_sa_init_lock);
return em_junk_sa_available;
@@ -549,7 +566,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
d(fprintf (stderr, "em_junk_sa_check_junk\n"));
- if (!em_junk_sa_is_available ())
+ if (!em_junk_sa_is_available (&target->error))
return FALSE;
if (em_junk_sa_use_spamc && em_junk_sa_use_daemon) {
@@ -575,7 +592,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
argv[i] = NULL;
- rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out) != 0;
+ rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0;
if (!rv && out && !strcmp ((const char *)out->data, "0/0\n")) {
/* an error occurred */
@@ -587,7 +604,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
argv [socket_i] = to_free = g_strdup (em_junk_sa_get_socket_path ());
pthread_mutex_unlock (&em_junk_sa_preferred_socket_path_lock);
- rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out) != 0;
+ rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0;
} else if (!em_junk_sa_use_spamc)
/* in case respawning were too fast we fallback to spamassassin */
rv = em_junk_sa_check_junk (ep, target);
@@ -618,7 +635,7 @@ get_spamassassin_version ()
if (!em_junk_sa_checked_spamassassin_version){
out = g_byte_array_new ();
- if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out) != 0){
+ if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out, NULL) != 0){
if(out)
g_byte_array_free (out, TRUE);
return em_junk_sa_spamassassin_version;
@@ -662,12 +679,12 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
d(fprintf (stderr, "em_junk_sa_report_junk\n"));
- if (em_junk_sa_is_available ()) {
+ if (em_junk_sa_is_available (&target->error)) {
if (em_junk_sa_local_only)
argv[4] = "--local";
pthread_mutex_lock (&em_junk_sa_report_lock);
- pipe_to_sa (msg, NULL, argv);
+ pipe_to_sa (msg, NULL, argv, &target->error);
pthread_mutex_unlock (&em_junk_sa_report_lock);
}
}
@@ -688,18 +705,18 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
d(fprintf (stderr, "em_junk_sa_report_notjunk\n"));
- if (em_junk_sa_is_available ()) {
+ if (em_junk_sa_is_available (&target->error)) {
if (em_junk_sa_local_only)
argv[4] = "--local";
pthread_mutex_lock (&em_junk_sa_report_lock);
- pipe_to_sa (msg, NULL, argv);
+ pipe_to_sa (msg, NULL, argv, &target->error);
pthread_mutex_unlock (&em_junk_sa_report_lock);
}
}
void
-em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
+em_junk_sa_commit_reports (EPlugin *ep)
{
char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild");
char *argv[4] = {
@@ -711,20 +728,20 @@ em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
d(fprintf (stderr, "em_junk_sa_commit_reports\n"));
- if (em_junk_sa_is_available ()) {
+ if (em_junk_sa_is_available (NULL)) {
if (em_junk_sa_local_only)
argv[2] = "--local";
pthread_mutex_lock (&em_junk_sa_report_lock);
- pipe_to_sa (NULL, NULL, argv);
+ pipe_to_sa (NULL, NULL, argv, NULL);
pthread_mutex_unlock (&em_junk_sa_report_lock);
}
}
void *
-em_junk_sa_validate_binary (EPlugin *ep, EMJunkHookTarget *target)
+em_junk_sa_validate_binary (EPlugin *ep)
{
- return em_junk_sa_is_available () ? "1" : NULL;
+ return em_junk_sa_is_available (NULL) ? "1" : NULL;
}
static void
generated by cgit (git 2.34.1) at 2024-12-26 03:20:46 +0800