changeset cb7602bb9c5c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=cb7602bb9c5c description: first load the plugins of the user directory. does not load the module twice.
diffstat:
src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diffs (22 lines):
diff -r 27b33dd6fe25 -r cb7602bb9c5c src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Aug 05 13:34:35 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' 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 @@
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)