From 8295089b95125e26fe439347fa908c0dbdc8ded5 Mon Sep 17 00:00:00 2001
From: Denis Fomin <fominde@gmail.com>
Date: Thu, 9 Aug 2012 21:48:00 +0400
Subject: [PATCH] first load the plugins of the user directory. does not load
the module twice.
---
src/plugins/pluginmanager.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/pluginmanager.py b/src/plugins/pluginmanager.py
index ed8e47fe9f..0ffb3c960e 100644
--- a/src/plugins/pluginmanager.py
+++ b/src/plugins/pluginmanager.py
@@ -100,7 +100,7 @@ class PluginManager(object):
'''
Registered handlers of GUI extension points.
'''
- for path in gajim.PLUGINS_DIRS:
+ for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]):
pc = PluginManager.scan_dir_for_plugins(path)
self.add_plugins(pc)
self._activate_all_plugins_from_global_config()
@@ -433,6 +433,9 @@ class PluginManager(object):
elif os.path.isdir(file_path) and scan_dirs:
module_name = elem_name
+ if module_name in sys.modules:
+ # do not load the module twice
+ continue
file_path += os.path.sep
try:
module = __import__(module_name)
--
GitLab