message sending bug fixes + sortilege update

- sortilege now use default profile. /!\ sortilege is really buggy currently, need some attention
This commit is contained in:
Goffi 2010-02-04 01:06:36 +11:00
commit 9fd444d937

View file

@ -60,7 +60,7 @@ class DbusObject(dbus.service.Object):
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
signature='sssss')
def newMessage(self, from_jid, msg, type='chat', to='', profile='@NONE@'):
def newMessage(self, from_jid, msg, type, to, profile):
debug("new message signal (from:%s msg:%s type:%s to:%s) sended", from_jid, msg, type, to)
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
@ -165,10 +165,11 @@ class DbusObject(dbus.service.Object):
return self.cb["getWaitingSub"](profile_key)
@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
in_signature='sss', out_signature='')
def sendMessage(self, to, message, profile_key='@DEFAULT@'):
in_signature='ssss', out_signature='')
def sendMessage(self, to, message, type='chat', profile_key='@DEFAULT@'):
debug("sendMessage...")
self.cb["sendMessage"](to, message, profile_key)
print "sendtype=", type #gof
self.cb["sendMessage"](to, message, type, profile_key)
@dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
in_signature='ssia{ss}s', out_signature='')
@ -293,7 +294,7 @@ class DBusBridge(Bridge):
def newContact(self, contact, attributes, groups, profile):
self.dbus_bridge.newContact(contact, attributes, groups, profile)
def newMessage(self,from_jid, msg, type, to, profile):
def newMessage(self, from_jid, msg, type='chat', to='', profile='@NONE@'):
debug("sending message...")
self.dbus_bridge.newMessage(from_jid, msg, type, to, profile)