Changeset 9863

Timestamp:

06/29/08 17:57:07 (5 months ago)

Author:

bct

Message:

fix esession toggling

Location:

trunk/src

Files:

• chat_control.py (modified) (2 diffs)
• dialogs.py (modified) (1 diff)
• session.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -2326 +2326 @@
         def _on_toggle_e2e_menuitem_activate(self, widget):
                 if self.session and self.session.enable_encryption:
+                        jid = str(self.session.jid)
+                        thread_id = self.session.thread_id
+
                         self.session.terminate_e2e()
 
-                        self.print_esession_details()
-
-                        jid = str(self.session.jid)
-
-                        gajim.connections[self.account].delete_session(jid,
-                                self.session.thread_id)
-
-                        self.set_session(gajim.connections[self.account].make_new_session(jid))
+                        gajim.connections[self.account].delete_session(jid, thread_id)
                 else:
                         if not self.session:
@@ -2342 +2338 @@
                                 self.set_session(new_sess)
 
-                        # XXX decide whether to use 4 or 3 message negotiation
                         self.session.negotiate_e2e(False)
 

trunk/src/dialogs.py

@@ -3819 +3819 @@
         def on_verify_now_button_clicked(self, widget):
                 pritext = _('''Have you verified the remote contact's identity?''')
-                sectext = _('''To prevent a man-in-the-middle attack, you should speak to this person directly (in person or on the phone) and verify that they see the same SAS as you.\n\nThis session's SAS: %s''') % self.session.sas
+                sectext = _('''To prevent a man-in-the-middle attack, you should speak to %s directly (in person or on the phone) and verify that they see the same SAS as you.\n\nThis session's SAS: <b>%s<b>''') % (self.session.jid, self.session.sas)
                 sectext += '\n\n' + _('Did you talk to the remote contact and verify the SAS?')
 

trunk/src/session.py

@@ -22 +22 @@
 
         def acknowledge_termination(self):
+                if self.control:
+                        self.control.set_session(None)
+
                 stanza_session.EncryptedStanzaSession.acknowledge_termination(self)
-
-                if self.control:
-                        if self.enable_encryption:
-                                self.control.print_esession_details()
-
-                        self.control.set_session(None)
 
         def terminate(self):