Changeset 10019

Timestamp:

07/25/08 00:13:37 (4 months ago)

Author:

js

Message:

Start autonegotiation when the user starts typing.

Files:

• trunk/src/chat_control.py (modified) (3 diffs)

trunk/src/chat_control.py

@@ -1153 +1153 @@
 
                 # Enable encryption if needed
+                self.no_autonegotiation = False
                 e2e_is_active = self.session and self.session.enable_encryption
                 self.gpg_is_active = False
                 gpg_pref = gajim.config.get_per('contacts', contact.jid,
                         'gpg_enabled')
-                e2e_pref = gajim.config.get_per('accounts', self.account,
-                        'autonegotiate_esessions') and \
-                        gajim.config.get_per('contacts', contact.jid,
-                        'autonegotiate_esessions')
 
                 # try GPG first
@@ -1179 +1176 @@
                         self.gpg_is_active,
                         self.session and self.session.is_loggable(), True)
-                # then try E2E
-                # XXX: Once we have fallback to disco, remove notexistant check
-                elif not e2e_is_active and gajim.HAVE_PYCRYPTO and e2e_pref \
-                and gajim.capscache.is_supported(contact, NS_ESESSION) \
-                and not gajim.capscache.is_supported(contact, 'notexistant'):
-                        self.begin_e2e_negotiation()
 
                 self.status_tooltip = gtk.Tooltips()
@@ -2261 +2252 @@
                 if textbuffer.get_char_count():
                         self.send_chatstate('composing', self.contact)
+
+                        e2e_is_active = self.session and \
+                                self.session.enable_encryption
+                        e2e_pref = gajim.config.get_per('accounts',
+                                self.account, 'autonegotiate_esessions') and \
+                                gajim.config.get_per('contacts',
+                                self.contact.jid, 'autonegotiate_esessions')
+                        # XXX: Once we have fallback to disco, remove
+                        #      notexistant check
+                        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'):
+                                self.no_autonegotiation = True
+                                self.begin_e2e_negotiation()
                 else:
                         self.send_chatstate('active', self.contact)