erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core,bridge: sendMessage bridge method is now async

Browse source
This commit is contained in:
Goffi 2013-12-17 01:46:45 +01:00
commit bc776be0f2
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontends/src/bridge/DBus.py
View file

@ -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", extra={}, profile_key="@NONE@"):
return self.db_core_iface.sendMessage(to_jid, message, subject, mess_type, extra, profile_key)
def sendMessage(self, to_jid, message, subject='', mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None):
return self.db_core_iface.sendMessage(to_jid, message, subject, mess_type, extra, profile_key, reply_handler=callback, error_handler=lambda err:errback(err._dbus_error_name[len(const_ERROR_PREFIX)+1:]))
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)

2
frontends/src/primitivus/primitivus
View file

@ -107,7 +107,7 @@ class EditBar(sat_widgets.ModalEdit):
editBar.get_edit_text(),
mess_type = "groupchat" if chat.type == 'group' else "chat",
profile_key=self.app.profile)
except:
except: # FIXME: bad global catch + sendMessage is now async
self.app.notify(_("Error while sending message"))
editBar.set_edit_text('')
elif self.mode == 'COMMAND':