Changeset 7681 for trunk/src/music_track_listener.py

Timestamp:

12/18/06 10:13:12 (2 years ago)

Author:

asterix

Message:

make music_track_listener work with older python-dbus than 0.80. see #2784

Files:

• trunk/src/music_track_listener.py (modified) (2 diffs)

trunk/src/music_track_listener.py

@@ -115 +115 @@
                 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')
@@ -130 +133 @@
 
                 ## 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')