diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
| commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
| tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /community/listen/listen-fix-dbus.diff | |
| parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
| parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'community/listen/listen-fix-dbus.diff')
| -rw-r--r-- | community/listen/listen-fix-dbus.diff | 49 |
1 files changed, 0 insertions, 49 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 "" |