changeset fa849f1418f1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fa849f1418f1 description: decrypt GPG messages one after the other. Fixes #7229
diffstat:
src/common/connection_handlers.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-)
diffs (57 lines):
diff -r bb3e5a5d706e -r fa849f1418f1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 18 15:16:11 2012 +0200 +++ b/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 @@ -767,6 +767,9 @@ # keep track of sessions this connection has with other JIDs self.sessions = {}
+ # We decrypt GPG messages one after the other. Keep queue in mem + self.gpg_messages_to_decrypt = [] + gajim.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, @@ -965,6 +968,14 @@ if sess.enable_encryption: sess.terminate_e2e()
+ def decrypt_thread(encmsg, keyID, obj): + decmsg = self.gpg.decrypt(encmsg, keyID) + decmsg = self.connection.Dispatcher.replace_non_character(decmsg) + # \x00 chars are not allowed in C (so in GTK) + obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) + obj.encrypted = 'xep27' + self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj]) + def _nec_message_received(self, obj): if obj.conn.name != self.name: return @@ -982,20 +993,18 @@
keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID: - def decrypt_thread(encmsg, keyID, obj): - decmsg = self.gpg.decrypt(encmsg, keyID) - decmsg = self.connection.Dispatcher.replace_non_character( - decmsg) - # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', - '')) - obj.encrypted = 'xep27' - gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_message_decrypted, [obj]) return self._on_message_decrypted(None, obj)
def _on_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], + self._on_message_decrypted, [obj]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))