diff -ru straw--mainline--0.26--patch-151/src/lib/strawdbus.py s3/src/lib/strawdbus.py --- straw--mainline--0.26--patch-151/src/lib/strawdbus.py 2005-06-19 10:54:01.000000000 -0400 +++ s3/src/lib/strawdbus.py 2005-07-19 10:36:44.000000000 -0400 @@ -1,21 +1,24 @@ import dbus +import dbus.service +if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): + import dbus.glib import subscribe import error -class FeedReader(dbus.Object): +class FeedReader(dbus.service.Object): service_name = "org.gnome.feed.Reader" object_path = "/org/gnome/feed/Reader" def __init__(self): try: self._session_bus = dbus.SessionBus() - self._service = dbus.Service(self.service_name, bus=self._session_bus) - dbus.Object.__init__(self, self.object_path, + self._service = dbus.service.BusName(self.service_name, bus=self._session_bus) + dbus.service.Object.__init__(self, self.object_path, self._service) except Exception, e: error.log_exc("Error while initializing dbus connection %s" % e) - @dbus.method("org.gnome.feed.Reader") + @dbus.service.method("org.gnome.feed.Reader") def Subscribe(self, url): subscribe.show(url=url) return True