From 4165d1ef0538971d39decb9926b617c9a351b6fc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 18 Jan 2010 16:04:56 -0500
Subject: Bug 606940 - plugin_lib_loadmodule() always enables the plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/plugin-lib/e-plugin-lib.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules')

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;
-- 
cgit