Changeset 10021

Timestamp:

07/25/08 00:14:42 (6 weeks ago)

Author:

js

Message:

Renegotiate if the remote end got disconnected and now got back online.

Location:

trunk/src

Files:

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

trunk/src/chat_control.py

@@ -2263 +2263 @@
                         if not e2e_is_active and e2e_pref and \
                         not self.no_autonegotiation and gajim.HAVE_PYCRYPTO \
-                        and e2e_pref and gajim.capscache.is_supported(
-                        self.contact, NS_ESESSION) and not \
-                        gajim.capscache.is_supported(self.contact,
-                        'notexistant'):
+                        and gajim.capscache.is_supported(self.contact,
+                        NS_ESESSION) and not gajim.capscache.is_supported(
+                        self.contact, 'notexistant'):
+                                self.begin_e2e_negotiation()
                                 self.no_autonegotiation = True
-                                self.begin_e2e_negotiation()
                 else:
                         self.send_chatstate('active', self.contact)

trunk/src/gajim.py

@@ -777 +777 @@
                                 # disable encryption, since if any messages are
                                 # lost they'll be not decryptable (note that
-                                # this contradicts XEP-0201 - trying to get the
+                                # this contradicts XEP-0201 - trying to get that
                                 # in the XEP, though)
+                                #
+                                # FIXME: This *REALLY* are TOO many leves of
+                                #        indentation! We even need to introduce
+                                #        a temp var here to make it somehow fit!
                                 if gajim.connections[account].sessions. \
                                 has_key(ji):
                                         for sess in gajim.connections \
                                         [account]. sessions[ji].values():
+                                                ctrl = sess.control
+                                                if ctrl:
+                                                        ctrl.no_autonegotiation\
+                                                                = False
                                                 if sess.enable_encryption:
                                                         sess.terminate_e2e()