Permalink
Browse files

Merge remote-tracking branch 'lichray/fix-new-dbus' into integration

  • Loading branch information...
2 parents 81dc8fc + ffb3c4b commit a6715d2a14cdbde5ff6738408e0c8129a2e9e65e @multani committed May 23, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −0 README.rst
  2. +2 −0 sonata/dbus_plugin.py
  3. +0 −2 sonata/plugins/gajim_tune.py
View
@@ -117,6 +117,10 @@ Currently, the following things have been changed since the Berlios's version:
This is the `remove-deprecated` branch.
+* Fix the initialization of DBus, due to the removal of deprecated stuff in
+ `remove-deprecated`. Thanks to Zhihao Yuan!
+
+
Personal todo list
------------------
View
@@ -27,6 +27,8 @@
import dbus
import dbus.service
import _dbus_bindings as dbus_bindings
+ from dbus.mainloop.glib import DBusGMainLoop
+ DBusGMainLoop(set_as_default=True)
HAVE_DBUS = True
except:
HAVE_DBUS = False
@@ -17,7 +17,6 @@
import gtk, pango
import dbus.service
-from dbus.mainloop.glib import DBusGMainLoop
songlabel = None
lasttune = ''
@@ -28,7 +27,6 @@ def on_enable(state):
global tune
if state and not tune:
tune = mpdtune()
- dbus.SessionBus(mainloop = DBusGMainLoop())
else:
if tune:
title = artist = album = ''

0 comments on commit a6715d2

Please sign in to comment.