From 5656b787dca27a1dc944830043fe116b0f233b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Mon, 26 Dec 2016 00:22:37 +0100 Subject: [PATCH 1/6] [mpris2] Dont enable Plugin on missing deps --- mpris2_support/mpris2_support.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mpris2_support/mpris2_support.py b/mpris2_support/mpris2_support.py index dda1d2e..3128c2d 100644 --- a/mpris2_support/mpris2_support.py +++ b/mpris2_support/mpris2_support.py @@ -9,8 +9,15 @@ from plugins.helpers import log_calls from plugins.plugin import GajimPluginException from common import dbus_support +ERR_MSG = '' + if dbus_support.supported: from music_track_listener import MusicTrackListener +else: + ERR_MSG = 'D-Bus Python bindings are missing' + +if os.name == 'nt': + ERR_MSG = 'Plugin can\'t be run under Windows.' class MusicTrackInfo(object): @@ -24,11 +31,12 @@ class Mpris2Plugin(GajimPlugin): self.description = _('MPRIS2 support. Allows to update status message ' 'according to the music you\'re listening via the MPRIS2 D-Bus API.') self.config_dialog = None + if ERR_MSG: + self.available_text = ERR_MSG + self.activatable = False + return self.artist = self.title = self.source = '' self.listener = MusicTrackListener().get() - if os.name == 'nt': - self.available_text = _('Plugin can\'t be run under Windows.') - self.activatable = False @log_calls('NowListenPlugin') def activate(self): From 790ed1872c80544799618c12d04702a189a1e117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Mon, 26 Dec 2016 00:23:52 +0100 Subject: [PATCH 2/6] [mpris2] Remove unused imports --- mpris2_support/mpris2_support.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mpris2_support/mpris2_support.py b/mpris2_support/mpris2_support.py index 3128c2d..1efc63a 100644 --- a/mpris2_support/mpris2_support.py +++ b/mpris2_support/mpris2_support.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- - import os -from common import gajim from plugins import GajimPlugin from plugins.helpers import log_calls -from plugins.plugin import GajimPluginException from common import dbus_support ERR_MSG = '' From a3c4a60f53974fea1c484ce89290e5dca492e524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Mon, 26 Dec 2016 00:27:30 +0100 Subject: [PATCH 3/6] [mpris2] Update CHANGELOG --- mpris2_support/CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 mpris2_support/CHANGELOG diff --git a/mpris2_support/CHANGELOG b/mpris2_support/CHANGELOG new file mode 100644 index 0000000..4dec5ba --- /dev/null +++ b/mpris2_support/CHANGELOG @@ -0,0 +1,4 @@ +0.3.3 - 26-12-2016 + +- Dont activate Plugin on missing dependencys +- Remove unused imports \ No newline at end of file From 934698c0625df60daaef614c89127aff81a4f474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Mon, 26 Dec 2016 00:30:47 +0100 Subject: [PATCH 4/6] [mpris2] Update manifest.ini --- mpris2_support/manifest.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpris2_support/manifest.ini b/mpris2_support/manifest.ini index 2ab99d1..d30529e 100644 --- a/mpris2_support/manifest.ini +++ b/mpris2_support/manifest.ini @@ -1,8 +1,8 @@ [info] name: MPRIS2 support short_name: mpris2_support -version: 0.3.2 +version: 0.3.3 description: MPRIS2 support. Allows to update status message according to the music you're listening via the MPRIS2 D-Bus API. authors = Denis Fomin -homepage = http://trac-plugins.gajim.org/wiki/MprisSupportPlugin +homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/mprissupportplugin min_gajim_version: 0.16.10 From aa0072c9d05e6373239d8bdeab1cf504391e5982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Fri, 27 Jan 2017 20:31:49 +0100 Subject: [PATCH 5/6] [now_listen] Fix imports --- now_listen/now_listen.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/now_listen/now_listen.py b/now_listen/now_listen.py index 432e694..a62224a 100644 --- a/now_listen/now_listen.py +++ b/now_listen/now_listen.py @@ -4,11 +4,10 @@ from gi.repository import Gtk from gi.repository import Gdk import os -from common import gajim from plugins import GajimPlugin from plugins.helpers import log_calls from plugins.gui import GajimPluginConfigDialog -from plugins.plugin import GajimPluginException +from plugins.gajimplugin import GajimPluginException from common import dbus_support if dbus_support.supported: From 070b6001ad7d7056d15e11d948f4a3763071ea52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Fri, 27 Jan 2017 21:25:05 +0100 Subject: [PATCH 6/6] [now_listen] Update manifest.ini --- now_listen/manifest.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/now_listen/manifest.ini b/now_listen/manifest.ini index 9be275f..61457e6 100644 --- a/now_listen/manifest.ini +++ b/now_listen/manifest.ini @@ -1,8 +1,8 @@ [info] name: Now Listen short_name: now-listen -version: 0.2.2 +version: 0.2.3 description: Copy tune info to conversation input box (alt + n) at cursor position authors = Denis Fomin -homepage = http://trac-plugins.gajim.org/wiki/NowListenPlugin +homepage = https://dev.gajim.org/gajim/gajim-plugins/wikis/NowListenPlugin min_gajim_version: 0.16.10