bridge: regenerated DBus bridge
This commit is contained in:
parent
8f6eb3cc41
commit
32a4841507
2 changed files with 11 additions and 5 deletions
|
|
@ -23,6 +23,11 @@ from bridge_frontend import BridgeFrontend
|
||||||
import dbus, dbus.glib
|
import dbus, dbus.glib
|
||||||
from logging import debug
|
from logging import debug
|
||||||
|
|
||||||
|
const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
|
||||||
|
const_OBJ_PATH = '/org/goffi/SAT/bridge'
|
||||||
|
const_COMM_SUFFIX = ".communication"
|
||||||
|
const_REQ_SUFFIX = ".request"
|
||||||
|
|
||||||
class BridgeExceptionNoService(Exception):
|
class BridgeExceptionNoService(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
@ -30,12 +35,12 @@ class DBusBridgeFrontend(BridgeFrontend):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
try:
|
try:
|
||||||
self.sessions_bus = dbus.SessionBus()
|
self.sessions_bus = dbus.SessionBus()
|
||||||
self.db_object = self.sessions_bus.get_object('org.goffi.SAT',
|
self.db_object = self.sessions_bus.get_object(const_INT_PREFIX,
|
||||||
'/org/goffi/SAT/bridge')
|
const_OBJ_PATH)
|
||||||
self.db_comm_iface = dbus.Interface(self.db_object,
|
self.db_comm_iface = dbus.Interface(self.db_object,
|
||||||
dbus_interface='org.goffi.SAT.communication')
|
dbus_interface=const_INT_PREFIX + const_COMM_SUFFIX)
|
||||||
self.db_req_iface = dbus.Interface(self.db_object,
|
self.db_req_iface = dbus.Interface(self.db_object,
|
||||||
dbus_interface='org.goffi.SAT.request')
|
dbus_interface=const_INT_PREFIX + const_REQ_SUFFIX)
|
||||||
except dbus.exceptions.DBusException,e:
|
except dbus.exceptions.DBusException,e:
|
||||||
if e._dbus_error_name=='org.freedesktop.DBus.Error.ServiceUnknown':
|
if e._dbus_error_name=='org.freedesktop.DBus.Error.ServiceUnknown':
|
||||||
raise BridgeExceptionNoService
|
raise BridgeExceptionNoService
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,7 @@ import dbus.mainloop.glib
|
||||||
from logging import debug, info
|
from logging import debug, info
|
||||||
|
|
||||||
const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
|
const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
|
||||||
|
const_OBJ_PATH = '/org/goffi/SAT/bridge'
|
||||||
const_COMM_SUFFIX = ".communication"
|
const_COMM_SUFFIX = ".communication"
|
||||||
const_REQ_SUFFIX = ".request"
|
const_REQ_SUFFIX = ".request"
|
||||||
|
|
||||||
|
|
@ -385,7 +386,7 @@ class DBusBridge(Bridge):
|
||||||
info ("Init DBus...")
|
info ("Init DBus...")
|
||||||
self.session_bus = dbus.SessionBus()
|
self.session_bus = dbus.SessionBus()
|
||||||
self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
|
self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
|
||||||
self.dbus_bridge = DbusObject(self.session_bus, '/org/goffi/SAT/bridge')
|
self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
|
||||||
|
|
||||||
def actionResult(self, answer_type, id, data):
|
def actionResult(self, answer_type, id, data):
|
||||||
self.dbus_bridge.actionResult(answer_type, id, data)
|
self.dbus_bridge.actionResult(answer_type, id, data)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue