Changeset 9964 for trunk/src/chat_control.py

Timestamp:

07/19/08 22:42:03 (5 months ago)

Author:

bct

Message:

added option for esession autonegotiation
added option for modp groups to use in a negotiation

Files:

• trunk/src/chat_control.py (modified) (1 diff)

trunk/src/chat_control.py

@@ -1156 +1156 @@
                 # then try E2E
                 # XXX: Once we have fallback to disco, remove notexistant check
-                elif not e2e_is_active and \
-                gajim.capscache.is_supported(contact, NS_ESESSION) and \
-                not gajim.capscache.is_supported(contact, 'notexistant'):
+                elif not e2e_is_active and gajim.HAVE_PYCRYPTO \
+                and gajim.config.get('autonegotiate_esessions') \
+                and gajim.capscache.is_supported(contact, NS_ESESSION) \
+                and not gajim.capscache.is_supported(contact, 'notexistant'):
                         self.begin_e2e_negotiation()