Mercurial > libervia-backend
diff sat_bridge/DBus.py @ 67:0e50dd3a234a
message sending bug fixes + sortilege update
- sortilege now use default profile. /!\ sortilege is really buggy currently, need some attention
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Thu, 04 Feb 2010 01:06:36 +1100 |
| parents | 8147b4f40809 |
| children | 9b842086d915 |
line wrap: on
line diff
--- a/sat_bridge/DBus.py Wed Feb 03 23:35:57 2010 +1100 +++ b/sat_bridge/DBus.py Thu Feb 04 01:06:36 2010 +1100 @@ -60,7 +60,7 @@ @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 @@ 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 @@ 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)