From 6bd518cb4a7c1baab6c08f3e9bba3cb8607faaf3 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 18 Dec 2006 09:13:12 +0000
Subject: [PATCH] make music_track_listener work with older python-dbus than
0.80. see #2784
---
src/music_track_listener.py | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/music_track_listener.py b/src/music_track_listener.py
index bebecebffc..92e6ee032a 100644
--- a/src/music_track_listener.py
+++ b/src/music_track_listener.py
@@ -114,12 +114,15 @@ class MusicTrackListener(gobject.GObject):
bus = dbus.SessionBus()
- if not hasattr(bus, 'name_has_owner'):
- print 'You need dbus-python >= 0.80' #FIXME: translate me or RM me for .12
- return None
-
## Check Muine playing track
- if bus.name_has_owner('org.gnome.Muine'):
+ test = False
+ if hasattr(bus, 'name_has_owner'):
+ if bus.name_has_owner('org.gnome.Muine'):
+ test = True
+ elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(),
+ 'org.gnome.Muine'):
+ test = True
+ if test:
obj = bus.get_object('org.gnome.Muine', '/org/gnome/Muine/Player')
player = dbus.Interface(obj, 'org.gnome.Muine.Player')
if player.GetPlaying():
@@ -129,7 +132,14 @@ class MusicTrackListener(gobject.GObject):
return song
## Check Rhythmbox playing song
- if bus.name_has_owner('org.gnome.Rhythmbox'):
+ test = False
+ if hasattr(bus, 'name_has_owner'):
+ if bus.name_has_owner('org.gnome.Rhythmbox'):
+ test = True
+ elif dbus.dbus_bindings.bus_name_has_owner(bus.get_connection(),
+ 'org.gnome.Rhythmbox'):
+ test = True
+ if test:
rbshellobj = bus.get_object('org.gnome.Rhythmbox',
'/org/gnome/Rhythmbox/Shell')
player = dbus.Interface(
--
GitLab