changeset c31a85bbdd58 in /home/hg/repos/gajim-plugins

author: Daniel Gultsch daniel@gultsch.de branches: details:gajim-plugins?cmd=changeset;node=c31a85bbdd58 description: Revert "Fix delay when sending messages - #13"

This reverts commit d970936e15c13e4738de37b0d2a60193ed828041.

diffstat:

omemo/__init__.py | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)

diffs (29 lines):

diff -r 6baad29f1308 -r c31a85bbdd58 omemo/__init__.py --- a/omemo/__init__.py Fri Feb 12 14:36:28 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 17:46:19 2016 +0100 @@ -452,17 +452,14 @@ if not state.encryption.is_active(to_jid): return False try: - from_jid = gajim.get_jid_from_account(account) - def _encrypt_thread(from_jid, to_jid, plaintext): - msg_dict = state.create_msg(from_jid, - to_jid, plaintext) - if not msg_dict: - return True - encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') - event.msg_iq.addChild(node=encrypted_node) - log.debug(account + ' → ' + str(event.msg_iq)) - gajim.thread_interface(_encrypt_thread, [from_jid, to_jid, plaintext]) + msg_dict = state.create_msg(gajim.get_jid_from_account(account), + to_jid, plaintext) + if not msg_dict: + return True + encrypted_node = OmemoMessage(msg_dict) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + log.debug(account + ' → ' + str(event.msg_iq)) except: return True