Changeset 10159

Timestamp:

08/09/08 00:55:12 (4 months ago)

Author:

bct

Message:

correctly decide whether to autonegotiate after a session was replaced

Location:

trunk/src

Files:

• chat_control.py (modified) (2 diffs)
• gajim.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -1154 +1154 @@
 
                 # Enable encryption if needed
-                self.no_autonegotiation = False
                 e2e_is_active = self.session and self.session.enable_encryption
                 self.gpg_is_active = False
@@ -2326 +2325 @@
                                 gajim.config.get_per('contacts',
                                 self.contact.jid, 'autonegotiate_esessions')
+
                         want_e2e = not e2e_is_active and not self.gpg_is_active \
                                 and e2e_pref
 
+                        already_negotiating = bool(self.session and \
+                                self.session.status)
+
                         # XXX: Once we have fallback to disco, remove
                         #      notexistant check
-                        if want_e2e and not self.no_autonegotiation \
-                        and gajim.HAVE_PYCRYPTO \
-                        and gajim.capscache.is_supported(self.contact,
-                        NS_ESESSION) and not gajim.capscache.is_supported(
-                        self.contact, 'notexistant'):
+                        can_e2e = gajim.HAVE_PYCRYPTO and gajim.capscache. \
+                                is_supported(self.contact, NS_ESESSION) and \
+                                not gajim.capscache.is_supported(self.contact,
+                                'notexistant')
+
+                        if want_e2e and not already_negotiating and can_e2e:
                                 self.begin_e2e_negotiation()
-                                self.no_autonegotiation = True
                 else:
                         self.send_chatstate('active', self.contact)

trunk/src/gajim.py

@@ -817 +817 @@
                                         if (ji+'/'+resource) != str(sess.jid):
                                                 continue
-                                        ctrl = sess.control
-                                        if ctrl:
-                                                ctrl.no_autonegotiation = False
                                         if sess.enable_encryption:
                                                 sess.terminate_e2e()