diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-09-21 15:49:37 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-09-21 15:49:37 +0000 |
commit | ae08410274473c5ab78d300ea2365c4b1070cc61 (patch) | |
tree | b7c8ba3dee66edfadb32e57332ed76025981c94d /community/listen | |
parent | d739da01541d53414129d3171df221cfe2440fe5 (diff) |
Wed Sep 21 15:49:35 UTC 2011
Diffstat (limited to 'community/listen')
-rw-r--r-- | community/listen/listen-fix-dbus.diff | 49 | ||||
-rw-r--r-- | community/listen/listen-fix-encoding.diff | 16 |
2 files changed, 0 insertions, 65 deletions
diff --git a/community/listen/listen-fix-dbus.diff b/community/listen/listen-fix-dbus.diff deleted file mode 100644 index 5953352f1..000000000 --- a/community/listen/listen-fix-dbus.diff +++ /dev/null @@ -1,49 +0,0 @@ -Index: src/dbus_manager.py -=================================================================== ---- src/dbus_manager.py (revision 670) -+++ src/dbus_manager.py (working copy) -@@ -30,9 +30,18 @@ - 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,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() -@@ -105,4 +114,4 @@ - 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 "" diff --git a/community/listen/listen-fix-encoding.diff b/community/listen/listen-fix-encoding.diff deleted file mode 100644 index 9c29e155c..000000000 --- a/community/listen/listen-fix-encoding.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur listen-0.5-orig/src/const.py listen-0.5/src/const.py ---- listen-0.5-orig/src/const.py 2007-03-19 20:52:43.000000000 -0400 -+++ listen-0.5/src/const.py 2007-03-19 20:53:41.000000000 -0400 -@@ -1,3 +1,4 @@ -+# coding=utf-8 - # vim: ts=4 - ### - # -diff -Naur listen-0.5-orig/src/song.py listen-0.5/src/song.py ---- listen-0.5-orig/src/song.py 2007-03-19 20:52:43.000000000 -0400 -+++ listen-0.5/src/song.py 2007-03-19 20:53:58.000000000 -0400 -@@ -1,3 +1,4 @@ -+# coding=utf-8 - # vim: ts=4 - ### - # |