Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 34ad4d92f3c38239740420b13951efd7 > files > 1

listen-0.5-4mdv2009.0.src.rpm

Index: src/dbus_manager.py
===================================================================
--- src/dbus_manager.py
+++ src/dbus_manager.py	2007-03-27 11:35:17.244974702 +0200
@@ -31,9 +31,17 @@
     import dbus
     import dbus.service
     #Try connection du message bus
-    dbus.SessionBus()
-    if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
-        import dbus.glib
+    dbus_version = getattr(dbus, 'version',(0,0,0))
+    if dbus_version >= (0,41,0) and dbus_version < (0,80,0):
+        dbus.SessionBus()
+        import dbus.glib
+    elif dbus_version >= (0,80,0):
+        from dbus.mainloop.glib import DBusGMainLoop
+        DBusGMainLoop(set_as_default=True)
+        dbus.SessionBus()
+    else:
+        pass
+        
 except: dbus_imported = False
 else: dbus_imported=True
 
@@ -42,14 +50,14 @@
 
 if not dbus_imported:
     class ListenDBus:
-        def __init__(self,win,player,object_path="/org/gnome/listen/"):
+        def __init__(self,win,player,object_path="/org/gnome/listen"):
             self.player = player
             self.win = win    
     print "No dbus support"
 else:
     
     class ListenDBus(dbus.service.Object):
-        def __init__(self,win,player,object_path="/org/gnome/listen/"):
+        def __init__(self,win,player,object_path="/org/gnome/listen"):
             self.player = player
             self.win = win
             self.bus = dbus.SessionBus()