Merge lp:~excieve/covergloobus/dev into lp:covergloobus

[Artem Gluvchynskyj]

Added support for Tomahawk player. Current stable version is incompatible with MPRIS2 (xesam:artist isn't passed correctly) but my patch to fix the compatibility has been accepted recently so trunk version (and future stable releases) works fine with this plugin.

[Alexandr Grigorcea (cahr-gr)]

review: Approve

[Artem Gluvchynskyj (excieve)]

Maybe I'm missing something but it looks like the change didn't land in trunk. I'm new to launchpad and bazaar - is there anything else needed from my end to complete the merge?

[Alexandr Grigorcea (cahr-gr)]

Should be ok now. Bazzar behaviour was always a mystery for me, sometime it
pushes the commit automatically, sometimes you have to make it explicitly.

On Fri, Apr 13, 2012 at 15:19, Artem Gluvchynskyj <email address hidden> wrote:

> Maybe I'm missing something but it looks like the change didn't land in
> trunk. I'm new to launchpad and bazaar - is there anything else needed from
> my end to complete the merge?
> --
> https://code.launchpad.net/~excieve/covergloobus/dev/+merge/101729<https://code.launchpad.net/%7Eexcieve/covergloobus/dev/+merge/101729>
> You are reviewing the proposed merge of lp:~excieve/covergloobus/dev into
> lp:covergloobus.
>

[Artem Gluvchynskyj (excieve)]

Thanks a lot! Appears to be fine now.

2012/4/13 Alexandr Grigorcea <email address hidden>

> Should be ok now. Bazzar behaviour was always a mystery for me, sometime it
> pushes the commit automatically, sometimes you have to make it explicitly.
>
> On Fri, Apr 13, 2012 at 15:19, Artem Gluvchynskyj <email address hidden>
> wrote:
>
> > Maybe I'm missing something but it looks like the change didn't land in
> > trunk. I'm new to launchpad and bazaar - is there anything else needed
> from
> > my end to complete the merge?
> > --
> > https://code.launchpad.net/~excieve/covergloobus/dev/+merge/101729<https://code.launchpad.net/%7Eexcieve/covergloobus/dev/+merge/101729>
> <https://code.launchpad.net/%7Eexcieve/covergloobus/dev/+merge/101729>
> > You are reviewing the proposed merge of lp:~excieve/covergloobus/dev into
> > lp:covergloobus.
> >
>
> --
> https://code.launchpad.net/~excieve/covergloobus/dev/+merge/101729<https://code.launchpad.net/%7Eexcieve/covergloobus/dev/+merge/101729>
> You are the owner of lp:~excieve/covergloobus/dev.
>

=== modified file 'src/players/Makefile.am'
--- src/players/Makefile.am	2011-11-19 19:17:07 +0000
+++ src/players/Makefile.am	2012-04-12 12:42:45 +0000
@@ -26,6 +26,7 @@
 	RhythmboxOld.py \
 	Songbird.py \
 	Spotify.py \
+	Tomahawk.py \
 	Totem.py \
 	VLC.py \
 	Xmms2client.py

=== added file 'src/players/Tomahawk.py'
--- src/players/Tomahawk.py	1970-01-01 00:00:00 +0000
+++ src/players/Tomahawk.py	2012-04-12 12:42:45 +0000
@@ -0,0 +1,28 @@
+# Copyright (C) 2009-2010 Gloobus Developers
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+from gettext import gettext as _
+
+from generic.Mpris2 import Mpris2
+
+class Tomahawk(Mpris2):
+
+    __title__ = 'Tomahawk'
+    __version__ = '0.1'
+    __authors__ = 'Alexandr Grigorcea <[e-mail]>, Artem Gluvhynsky <[e-mail]>'
+    __desc__ = _('Tomahawk music player plugin')
+
+    DBUS_NAME   = 'org.mpris.MediaPlayer2.tomahawk'