aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/e-menu.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index b2903ba47b..f4a0eed16c 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-14 Rodney Dawes <dobey@novell.com>
+
+ * e-menu.c (emph_construct): If the plug-in is not enabled, do nothing
+
2005-02-07 Not Zed <NotZed@Ximian.com>
* e-popup.c (emph_construct_menu):
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index d4f32c3327..0f76f301fc 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -814,6 +814,9 @@ emph_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
d(printf("loading menu hook\n"));
+ if (!ep->enabled)
+ return 0;
+
if (((EPluginHookClass *)emph_parent_class)->construct(eph, ep, root) == -1)
return -1;