changeset 40f5ddb7a8b4 in /home/hg/repos/gajim-plugins
buthor: Yann Leboulanger asterix@lagaule.org ranches: details:gajim-plugins?cmd=changeset;node=40f5ddb7a8b4 description: look in correct ftp folder according to gajim version
diffstat:
plugin_installer/manifest.ini | 2 +- plugin_installer/plugin_installer.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-)
diffs (46 lines):
diff -r e69475bff1f4 -r 40f5ddb7a8b4 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Sun Aug 25 16:58:42 2013 +0200 +++ b/plugin_installer/manifest.ini Wed Aug 28 13:16:43 2013 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.11.7 +version: 0.11.9 description: Install and upgrade plugins from ftp authors: Denis Fomin fominde@gmail.com Yann Leboulanger asterix@lagaule.org diff -r e69475bff1f4 -r 40f5ddb7a8b4 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Aug 25 16:58:42 2013 +0200 +++ b/plugin_installer/plugin_installer.py Wed Aug 28 13:16:43 2013 +0200 @@ -74,6 +74,12 @@ icon = gtk.Image() self.def_icon = icon.render_icon(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + if gajim.version.startswith('0.15'): + self.server_folder = 'plugins_0.15' + elif gajim.version.startswith('0.16.10'): + self.server_folder = 'plugins_gtk3' + else: + self.server_folder = 'plugins_0.16'
@log_calls('PluginInstallerPlugin') def activate(self): @@ -114,7 +120,7 @@ try: to_update = [] con = self.ftp_connect() - con.cwd('plugins_0.16') + con.cwd(self.server_folder) con.retrbinary('RETR manifests.zip', ftp.handleDownload) zip_file = zipfile.ZipFile(ftp.buffer_) manifest_list = zip_file.namelist() @@ -501,7 +507,7 @@ gobject.idle_add(self.progressbar.set_text, _('Connecting to server')) self.ftp = self.plugin.ftp_connect() - self.ftp.cwd('plugins_0.16') + self.ftp.cwd(self.plugin.server_folder) if not self.remote_dirs: gobject.idle_add(self.progressbar.set_text, _('Scan files on the server'))