make music_track_listener work with older python-dbus than 0.80. see #2784
This commit is contained in:
parent
905e38f84f
commit
6bd518cb4a
|
@ -114,12 +114,15 @@ class MusicTrackListener(gobject.GObject):
|
||||||
|
|
||||||
bus = dbus.SessionBus()
|
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
|
## Check Muine playing track
|
||||||
|
test = False
|
||||||
|
if hasattr(bus, 'name_has_owner'):
|
||||||
if bus.name_has_owner('org.gnome.Muine'):
|
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')
|
obj = bus.get_object('org.gnome.Muine', '/org/gnome/Muine/Player')
|
||||||
player = dbus.Interface(obj, 'org.gnome.Muine.Player')
|
player = dbus.Interface(obj, 'org.gnome.Muine.Player')
|
||||||
if player.GetPlaying():
|
if player.GetPlaying():
|
||||||
|
@ -129,7 +132,14 @@ class MusicTrackListener(gobject.GObject):
|
||||||
return song
|
return song
|
||||||
|
|
||||||
## Check Rhythmbox playing song
|
## Check Rhythmbox playing song
|
||||||
|
test = False
|
||||||
|
if hasattr(bus, 'name_has_owner'):
|
||||||
if bus.name_has_owner('org.gnome.Rhythmbox'):
|
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',
|
rbshellobj = bus.get_object('org.gnome.Rhythmbox',
|
||||||
'/org/gnome/Rhythmbox/Shell')
|
'/org/gnome/Rhythmbox/Shell')
|
||||||
player = dbus.Interface(
|
player = dbus.Interface(
|
||||||
|
|
Loading…
Reference in New Issue