From eec09a3e6b0f364fbe1db4c0915dad8df4acb875 Mon Sep 17 00:00:00 2001 From: Vivek Jain Date: Wed, 26 Oct 2005 10:25:42 +0000 Subject: **See #313096 2005-10-26 Vivek Jain **See #313096 * em-junk-hook.c: (emjh_construct) load the plugin only if it is enabled. svn path=/trunk/; revision=30567 --- mail/ChangeLog | 7 +++++++ mail/em-junk-hook.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 3da985747d..d7ad209c6b 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2005-10-26 Vivek Jain + + **See #313096 + + * em-junk-hook.c: (emjh_construct) + load the plugin only if it is enabled. + 2005-10-22 Parthasarathi Susarla * mail-config.c: (mail_config_get_default_account): diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index af61459f4d..b02bc4cb59 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -249,8 +249,8 @@ emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) if (((EPluginHookClass *)emjh_parent_class)->construct(eph, ep, root) == -1) return -1; - if (loaded) { - g_warning ("Can't load multiple plugins to this hook:ignored"); + if (!ep->enabled || loaded) { + g_warning ("ignored this junk plugin: not enabled or we have already loaded one"); return -1; } -- cgit