Use the new 1.8 bindings' ecore mainloop wrapper for dbus.

This commit is contained in:
Kai Huuhko 2013-04-06 17:49:55 +03:00
parent 9c043d1fe1
commit e74f0ad2a7
1 changed files with 32 additions and 37 deletions

View File

@ -47,17 +47,13 @@ def setup_log():
log = setup_log() log = setup_log()
DBUS_ENABLED = None
try: try:
import e_dbus from e_dbus import DBusEcoreMainLoop
except ImportError: except ImportError:
DBUS_ENABLED = False from efl.dbus_mainloop import DBusEcoreMainLoop
log.info("e_dbus not found")
else:
DBUS_ENABLED = True
import dbus import dbus
ml = e_dbus.DBusEcoreMainLoop() ml = DBusEcoreMainLoop()
dbus.set_default_main_loop(ml) dbus.set_default_main_loop(ml)
import dbus.service import dbus.service
bus = dbus.SessionBus() bus = dbus.SessionBus()
@ -127,7 +123,6 @@ class Epour(object):
for t in torrents: for t in torrents:
self.session.add_torrent(t) self.session.add_torrent(t)
if DBUS_ENABLED:
self.dbusname = dbus.service.BusName("net.launchpad.epour", dbus.SessionBus()) self.dbusname = dbus.service.BusName("net.launchpad.epour", dbus.SessionBus())
self.dbo = EpourDBus(self) self.dbo = EpourDBus(self)