[evolution-patches] fix for #313096 (mail)



Hi,

The attached patch fixes
http://bugzilla.gnome.org/show_bug.cgi?id=313096 .

We don't want to load multiple plugins at all on this hook. As IMHO
having multiple junk filtering mechanisms simultaneously is not a good
case, so we disallow that. 
This fix stops hook to load a plugin if it is disabled.
So you just have to disable the unwanted plugin, to make a non-default
plugin work.

Thanks,
Vivek Jain
Index: em-junk-hook.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-junk-hook.c,v
retrieving revision 1.2
diff -u -p -r1.2 em-junk-hook.c
--- em-junk-hook.c	24 Aug 2005 03:05:26 -0000	1.2
+++ em-junk-hook.c	25 Oct 2005 05:47:55 -0000
@@ -249,8 +249,8 @@ emjh_construct(EPluginHook *eph, EPlugin
 	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;
 	}
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]