Author: asterix Date: 2006-12-18 10:13:12 +0100 (Mon, 18 Dec 2006) New Revision: 7681
Modified: trunk/src/music_track_listener.py Log: make music_track_listener work with older python-dbus than 0.80. see #2784
Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2006-12-18 08:55:34 UTC (rev 7680) +++ trunk/src/music_track_listener.py 2006-12-18 09:13:12 UTC (rev 7681) @@ -114,12 +114,15 @@
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 @@ 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(