diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 <jvivek@novell.com> + + **See #313096 + + * em-junk-hook.c: (emjh_construct) + load the plugin only if it is enabled. + 2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com> * 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; } |