bridge: constructor and template improved, documentation added

This commit is contained in:
Goffi 2011-01-24 17:47:45 +01:00
commit 793e6d6c3d

View file

@ -24,7 +24,6 @@ from bridge import Bridge
import dbus
import dbus.service
import dbus.mainloop.glib
import pdb
from logging import debug, info, error
const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
@ -55,7 +54,7 @@ class DbusObject(dbus.service.Object):
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
signature='ss')
def connection_error(self, profile, error_type):
def connection_error(self, error_type, profile):
debug("Connection_error signal")
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
@ -142,7 +141,7 @@ class DbusObject(dbus.service.Object):
in_signature='s', out_signature='i')
def deleteProfile(self, name):
info ('Profile deletion asked')
return self.cb["deleteProfile"](str(name))
return self.cb["deleteProfile"](unicode(name))
@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
in_signature='sssi', out_signature='s')
@ -163,7 +162,7 @@ class DbusObject(dbus.service.Object):
return self.cb["disconnect"](profile_key)
@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
in_signature='', out_signature='b')
in_signature='s', out_signature='b')
def isConnected(self, profile_key='@DEFAULT@'):
info ("Connection status asked")
return self.cb["isConnected"](profile_key)