Ticket #566: listen-fix-dbus.diff

src/dbus_manager.py

@@ -30 +30 @@
     import dbus
     import dbus.service
     #Try connection du message bus
-    dbus.SessionBus()
-    if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
+    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
 
@@ -41 +50 @@
 
 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()
@@ -105 +114 @@
                 song = self.player.song    
                 return str( song.get_str("title")+ " - ("+song.get_str("album")+" - "+song.get_str("artist")+")")
             else:
-                return ""
- No newline at end of file
+                return ""