aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@novell.com>2005-02-14 23:52:12 +0800
committerRodney Dawes <dobey@src.gnome.org>2005-02-14 23:52:12 +0800
commit9e3f71e15a1016dff6354452eb9aac78601c18b4 (patch)
treedf3512f0ef5068b3c5aec161e9427e4aaff6cd3a
parentf4cbe8bfbeb947a90402700838d65765b66e917b (diff)
downloadgsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar.gz
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar.bz2
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar.lz
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar.xz
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.tar.zst
gsoc2013-evolution-9e3f71e15a1016dff6354452eb9aac78601c18b4.zip
If the plug-in is not enabled, do nothing
2005-02-14 Rodney Dawes <dobey@novell.com> * e-menu.c (emph_construct): If the plug-in is not enabled, do nothing svn path=/trunk/; revision=28787
-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;