copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't autonegotiate if gpg is already active

Browse source
This commit is contained in:
Brendan Taylor 2008-07-27 21:42:34 +00:00
parent 36f286f808
commit d8070318ff
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/chat_control.py
View file

@ -2264,10 +2264,13 @@ class ChatControl(ChatControlBase):
self.account, 'autonegotiate_esessions') and \ self.account, 'autonegotiate_esessions') and \
gajim.config.get_per('contacts', gajim.config.get_per('contacts',
self.contact.jid, 'autonegotiate_esessions') self.contact.jid, 'autonegotiate_esessions')
want_e2e = not e2e_is_active and not self.gpg_is_active \
and e2e_pref
# XXX: Once we have fallback to disco, remove # XXX: Once we have fallback to disco, remove
# notexistant check # notexistant check
if not e2e_is_active and e2e_pref and \ if want_e2e and not self.no_autonegotiation \
not self.no_autonegotiation and gajim.HAVE_PYCRYPTO \ and gajim.HAVE_PYCRYPTO \
and gajim.capscache.is_supported(self.contact, and gajim.capscache.is_supported(self.contact,
NS_ESESSION) and not gajim.capscache.is_supported( NS_ESESSION) and not gajim.capscache.is_supported(
self.contact, 'notexistant'): self.contact, 'notexistant'):