[evolution] Bug 606940 - plugin_lib_loadmodule() always enables the plugin
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Bug 606940 - plugin_lib_loadmodule() always enables the plugin
- Date: Mon, 18 Jan 2010 21:05:22 +0000 (UTC)
commit 4165d1ef0538971d39decb9926b617c9a351b6fc
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Jan 18 16:04:56 2010 -0500
Bug 606940 - plugin_lib_loadmodule() always enables the plugin
modules/plugin-lib/e-plugin-lib.c | 4 ++++
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 1cade4b..5541650 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]