From 5d28985ca6feeb48d86855092d2e13e4dfcd9fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Wed, 25 Apr 2018 20:25:29 +0200 Subject: [PATCH] [plugin_installer] Use configpaths api for getting path --- plugin_installer/plugin_installer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py index fa63ae8..d863bd0 100644 --- a/plugin_installer/plugin_installer.py +++ b/plugin_installer/plugin_installer.py @@ -49,6 +49,7 @@ try: from gtkgui_helpers import get_action except ImportError: from gajim.common import app + from gajim.common import configpaths from gajim.plugins import GajimPlugin from gajim.plugins.gui import GajimPluginConfigDialog from gajim.htmltextview import HtmlTextView @@ -95,7 +96,7 @@ def get_local_version(plugin_manifest): if not active: return manifest_path = os.path.join( - app.PLUGINS_DIRS[1], short_name, 'manifest.ini') + configpaths.get('PLUGINS_USER'), short_name, 'manifest.ini') if not os.path.exists(manifest_path): return conf = configparser.ConfigParser() @@ -294,7 +295,7 @@ class PluginInstaller(GajimPlugin): for _dir in plugin_dirs: is_active = False plugins = None - plugin_dir = os.path.join(app.PLUGINS_DIRS[1], _dir) + plugin_dir = os.path.join(configpaths.get('PLUGINS_USER'), _dir) plugin = app.plugin_manager.get_plugin_by_path(plugin_dir) if plugin: if plugin.active: @@ -571,7 +572,7 @@ class DownloadAsync(threading.Thread): for remote_dir in self.remote_dirs: filename = remote_dir + '.zip' log.info('Download: %s', filename) - base_dir, user_dir = app.PLUGINS_DIRS + user_dir = configpaths.get('PLUGINS_USER') if not os.path.isdir(user_dir): os.mkdir(user_dir) local_dir = os.path.join(user_dir, remote_dir)