core: sendMessage's options parameter has been renamed to extra to be consistent with newMessage
This commit is contained in:
parent
60f03a623e
commit
9d42c269db
2 changed files with 24 additions and 22 deletions
|
|
@ -196,8 +196,8 @@ class DBusBridgeFrontend(BridgeFrontend):
|
|||
def registerNewAccount(self, login, password, email, host, port=5222):
|
||||
return unicode(self.db_core_iface.registerNewAccount(login, password, email, host, port))
|
||||
|
||||
def sendMessage(self, to_jid, message, subject='', mess_type="auto", options={}, profile_key="@NONE@"):
|
||||
return self.db_core_iface.sendMessage(to_jid, message, subject, mess_type, options, profile_key)
|
||||
def sendMessage(self, to_jid, message, subject='', mess_type="auto", extra={}, profile_key="@NONE@"):
|
||||
return self.db_core_iface.sendMessage(to_jid, message, subject, mess_type, extra, profile_key)
|
||||
|
||||
def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
|
||||
return self.db_core_iface.setParam(name, value, category, security_limit, profile_key)
|
||||
|
|
|
|||
|
|
@ -282,11 +282,11 @@ class QuickApp(object):
|
|||
timestamp = extra.get('archive')
|
||||
self.chat_wins[win.bare].printMessage(from_jid, msg, profile, float(timestamp) if timestamp else '')
|
||||
|
||||
def sendMessage(self, to_jid, message, subject='', mess_type="auto", options={}, profile_key="@NONE@"):
|
||||
def sendMessage(self, to_jid, message, subject='', mess_type="auto", extra={}, profile_key="@NONE@"):
|
||||
if to_jid.startswith(const_PRIVATE_PREFIX):
|
||||
to_jid = unescapePrivate(to_jid)
|
||||
mess_type = "chat"
|
||||
self.bridge.sendMessage(to_jid, message, subject, mess_type, options, profile_key)
|
||||
self.bridge.sendMessage(to_jid, message, subject, mess_type, extra, profile_key)
|
||||
|
||||
def newAlert(self, msg, title, alert_type, profile):
|
||||
if not self.check_profile(profile):
|
||||
|
|
|
|||
Loading…
Reference in a new issue