diff options
| author | Brendan Taylor <bct@diffeq.com> | 2008-10-12 02:37:11 +0400 |
|---|---|---|
| committer | Brendan Taylor <bct@diffeq.com> | 2008-10-12 02:37:11 +0400 |
| commit | 8757449816555b526c6d22a9a76c9b5267c6b69a (patch) | |
| tree | 50cfa36cca4327b8004a45cb83cfa531a5498478 | |
| parent | 6e596e3db0b422335c07ecdec2ae55e4b5c8b838 (diff) | |
fix renegotiation when a message was unable to decrypt. fixes #4360.
| -rwxr-xr-x | src/gajim.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gajim.py b/src/gajim.py index 0a15d25c7..76b115825 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -1818,9 +1818,9 @@ class Interface: details = _('Unable to decrypt message from ' '%s\nIt may have been tampered with.') % jid - if session.control: - session.control.print_conversation_line(details, - 'status', '', tim) + ctrl = session.control + if ctrl: + ctrl.print_conversation_line(details, 'status', '', tim) else: dialogs.WarningDialog(_('Unable to decrypt message'), details) @@ -1830,7 +1830,8 @@ class Interface: session.conn.delete_session(jid, session.thread_id) # restart the session - session.negotiate_e2e(False) + if ctrl: + ctrl.begin_e2e_negotiation() def handle_event_privacy_lists_received(self, account, data): # ('PRIVACY_LISTS_RECEIVED', account, list) |