diff --git a/plugin_installer/manifest.ini b/plugin_installer/manifest.ini index 817c72296569b542f8d1dfb8ddd6929a13ecd296..3c1695c28db367b29495a65c7e775ce13d5405b1 100644 --- a/plugin_installer/manifest.ini +++ b/plugin_installer/manifest.ini @@ -1,7 +1,7 @@ [info] name: Plugin Installer short_name: plugin_installer -version: 0.9.1 +version: 0.9.2 description: Install and upgrade plugins from ftp authors: Denis Fomin <fominde@gmail.com> Yann Leboulanger <asterix@lagaule.org> diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py index 3375c88232f4790db43626a71eaf9e0114b79ff1..064f3bb5afecf9213c478c4e29c340453abc179e 100644 --- a/plugin_installer/plugin_installer.py +++ b/plugin_installer/plugin_installer.py @@ -285,8 +285,13 @@ class PluginInstaller(GajimPlugin): if is_active and plugin.name != self.name: gobject.idle_add(gajim.plugin_manager.activate_plugin, plugin) if plugin.name != 'Plugin Installer': - self.installed_plugins_model.append([plugin, plugin.name, - is_active, plugin.activatable]) + version = gajim.version.split('-')[0] + if version == '0.15': + self.installed_plugins_model.append([plugin, plugin.name, + is_active]) + else: + self.installed_plugins_model.append([plugin, plugin.name, + is_active, plugin.activatable]) dialog = HigDialog(None, gtk.MESSAGE_INFO, gtk.BUTTONS_OK, '', _('All selected plugins downloaded')) dialog.set_modal(False) diff --git a/ubuntu_integration/manifest.ini b/ubuntu_integration/manifest.ini index b7a67af939a7444eae58edb94e7cf620f6b1f1ed..397b7dc7dc5505ae0a71574c91aadb43f56a74ed 100644 --- a/ubuntu_integration/manifest.ini +++ b/ubuntu_integration/manifest.ini @@ -1,7 +1,7 @@ [info] name: Ubuntu Ayatana Integration short_name: ubuntu_integration -version: 0.1.1 +version: 0.1.2 description: This plugin integrates Gajim with the Ubuntu Messaging Menu. You must have python-indicate and python-xdg (and Gajim obviously) installed to enable this plugin. diff --git a/ubuntu_integration/plugin.py b/ubuntu_integration/plugin.py index 2298ba82213b832510a82c3970a4bfcdf84ceacc..63bc973fa4c9a2b748e4b03c3f8e43af3c394a57 100644 --- a/ubuntu_integration/plugin.py +++ b/ubuntu_integration/plugin.py @@ -25,12 +25,6 @@ from plugins.plugin import GajimPluginException from plugins.helpers import log_calls from common import gajim import gtkgui_helpers -# 3rd party -try: - __import__('indicate') - HAS_INDICATE = True -except ImportError: - HAS_INDICATE = False class UbuntuIntegrationPlugin(GajimPlugin): @@ -50,6 +44,22 @@ class UbuntuIntegrationPlugin(GajimPlugin): 'Many thanks to the guys from gajim@conference.gajim.org for ' 'answering my questions :)') self.config_dialog = None + self.test_activatable() + + def test_activatable(self): + self.available_text = '' + try: + from xdg.BaseDirectory import load_data_paths + except ImportError: + self.activatable = False + self.available_text += _('python-xdg is missing! ' + 'Install python-xdg.\n') + try: + import indicate + except ImportError: + self.activatable = False + self.available_text += _('python-indicate is missing! ' + 'Install python-indicate.') @log_calls("UbuntuIntegrationPlugin") def activate(self): @@ -59,13 +69,9 @@ class UbuntuIntegrationPlugin(GajimPlugin): # {(account, jid): (indicator, [event, ...]), ...} self.events = {} - try: - from xdg.BaseDirectory import load_data_paths - except ImportError: - raise GajimPluginException("python-xdg is missing!") - - if not HAS_INDICATE: - raise GajimPluginException("python-indicate is missing!") + version = gajim.version.split('-')[0] + if version == '0.15' and self.available_text: + raise GajimPluginException(self.available_text) self.server = indicate.indicate_server_ref_default() self.server.set_type("message.im")