changeset 74d3115769e9 in /home/hg/repos/gajim-plugins

buthor: Yann Leboulanger asterix@lagaule.org ranches: gajim_0.15 details:gajim-plugins?cmd=changeset;node=74d3115769e9 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 9bb38e6a99e9 -r 74d3115769e9 plugin_installer/manifest.ini --- a/plugin_installer/manifest.ini Wed Aug 28 12:18:53 2013 +0400 +++ b/plugin_installer/manifest.ini Wed Aug 28 13:19:21 2013 +0200 @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.11.6 +version: 0.11.8 description: Install and upgrade plugins from ftp authors: Denis Fomin fominde@gmail.com Yann Leboulanger asterix@lagaule.org diff -r 9bb38e6a99e9 -r 74d3115769e9 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Wed Aug 28 12:18:53 2013 +0400 +++ b/plugin_installer/plugin_installer.py Wed Aug 28 13:19:21 2013 +0200 @@ -75,6 +75,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): @@ -115,7 +121,7 @@ try: to_update = [] con = self.ftp_connect() - con.cwd('plugins_0.15') + con.cwd(self.server_folder) con.retrbinary('RETR manifests.zip', ftp.handleDownload) zip_file = zipfile.ZipFile(ftp.buffer_) manifest_list = zip_file.namelist() @@ -502,7 +508,7 @@ gobject.idle_add(self.progressbar.set_text, _('Connecting to server')) self.ftp = self.plugin.ftp_connect() - self.ftp.cwd('plugins_0.15') + self.ftp.cwd(self.plugin.server_folder) if not self.remote_dirs: gobject.idle_add(self.progressbar.set_text, _('Scan files on the server'))