aboutsummaryrefslogtreecommitdiffstats
path: root/modules/plugin-lib/e-plugin-lib.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-01-19 05:04:56 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-01-19 05:04:56 +0800
commit4165d1ef0538971d39decb9926b617c9a351b6fc (patch)
tree2b74fa17aeb884fb9615545b521796c9f9dc7d3e /modules/plugin-lib/e-plugin-lib.c
parentf6d07f6cc622da5409a4f09db2b34d9c44f71011 (diff)
downloadgsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar.gz
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar.bz2
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar.lz
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar.xz
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.tar.zst
gsoc2013-evolution-4165d1ef0538971d39decb9926b617c9a351b6fc.zip
BugĀ 606940 - plugin_lib_loadmodule() always enables the plugin
Diffstat (limited to 'modules/plugin-lib/e-plugin-lib.c')
-rw-r--r--modules/plugin-lib/e-plugin-lib.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index 1cade4b06d..5541650dfa 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -60,6 +60,10 @@ plugin_lib_loadmodule (EPlugin *plugin)
return -1;
}
+ /* If the plugin is disabled, we're done. */
+ if (!plugin->enabled)
+ return 0;
+
if (g_module_symbol (plugin_lib->module, "e_plugin_lib_enable", (gpointer)&enable)) {
if (enable (plugin, TRUE) != 0) {
plugin->enabled = FALSE;