|
Lines 30-38
Link Here
|
| 30 |
import dbus |
30 |
import dbus |
| 31 |
import dbus.service |
31 |
import dbus.service |
| 32 |
#Try connection du message bus |
32 |
#Try connection du message bus |
| 33 |
dbus.SessionBus() |
33 |
dbus_version = getattr(dbus, 'version',(0,0,0)) |
| 34 |
if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): |
34 |
if dbus_version >= (0,41,0) and dbus_version < (0,80,0): |
|
|
35 |
dbus.SessionBus() |
| 35 |
import dbus.glib |
36 |
import dbus.glib |
|
|
37 |
elif dbus_version >= (0,80,0): |
| 38 |
from dbus.mainloop.glib import DBusGMainLoop |
| 39 |
DBusGMainLoop(set_as_default=True) |
| 40 |
dbus.SessionBus() |
| 41 |
else: |
| 42 |
pass |
| 43 |
|
| 44 |
|
| 36 |
except: dbus_imported = False |
45 |
except: dbus_imported = False |
| 37 |
else: dbus_imported=True |
46 |
else: dbus_imported=True |
| 38 |
|
47 |
|
|
Lines 41-54
Link Here
|
| 41 |
|
50 |
|
| 42 |
if not dbus_imported: |
51 |
if not dbus_imported: |
| 43 |
class ListenDBus: |
52 |
class ListenDBus: |
| 44 |
def __init__(self,win,player,object_path="/org/gnome/listen/"): |
53 |
def __init__(self,win,player,object_path="/org/gnome/listen"): |
| 45 |
self.player = player |
54 |
self.player = player |
| 46 |
self.win = win |
55 |
self.win = win |
| 47 |
print "No dbus support" |
56 |
print "No dbus support" |
| 48 |
else: |
57 |
else: |
| 49 |
|
58 |
|
| 50 |
class ListenDBus(dbus.service.Object): |
59 |
class ListenDBus(dbus.service.Object): |
| 51 |
def __init__(self,win,player,object_path="/org/gnome/listen/"): |
60 |
def __init__(self,win,player,object_path="/org/gnome/listen"): |
| 52 |
self.player = player |
61 |
self.player = player |
| 53 |
self.win = win |
62 |
self.win = win |
| 54 |
self.bus = dbus.SessionBus() |
63 |
self.bus = dbus.SessionBus() |
|
Lines 105-108
Link Here
|
| 105 |
song = self.player.song |
114 |
song = self.player.song |
| 106 |
return str( song.get_str("title")+ " - ("+song.get_str("album")+" - "+song.get_str("artist")+")") |
115 |
return str( song.get_str("title")+ " - ("+song.get_str("album")+" - "+song.get_str("artist")+")") |
| 107 |
else: |
116 |
else: |
| 108 |
return "" |
117 |
return "" |