copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

first load the plugins of the user directory. does not load the module twice.

Browse source
This commit is contained in:
Denis Fomin 2012-08-09 21:48:00 +04:00
parent 57c8fdad39
commit 8295089b95
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/pluginmanager.py
View file

@ -100,7 +100,7 @@ class PluginManager(object):
''' '''
Registered handlers of GUI extension points. 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) pc = PluginManager.scan_dir_for_plugins(path)
self.add_plugins(pc) self.add_plugins(pc)
self._activate_all_plugins_from_global_config() self._activate_all_plugins_from_global_config()
@ -433,6 +433,9 @@ class PluginManager(object):
elif os.path.isdir(file_path) and scan_dirs: elif os.path.isdir(file_path) and scan_dirs:
module_name = elem_name module_name = elem_name
if module_name in sys.modules:
# do not load the module twice
continue
file_path += os.path.sep file_path += os.path.sep
try: try:
module = __import__(module_name) module = __import__(module_name)