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

negotiate esession only if enable_esessions is activated. Fixes #4738

This commit is contained in:
Yann Leboulanger 2009-01-30 16:48:15 +00:00
parent ac05e57aa7
commit d673e04935
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/chat_control.py
View File

@ -2409,10 +2409,10 @@ class ChatControl(ChatControlBase):
e2e_is_active = self.session and \ e2e_is_active = self.session and \
self.session.enable_encryption self.session.enable_encryption
e2e_pref = gajim.config.get_per('accounts', e2e_pref = gajim.config.get_per('accounts', self.account,
self.account, 'autonegotiate_esessions') and \ 'enable_esessions') and gajim.config.get_per('accounts',
gajim.config.get_per('contacts', self.account, 'autonegotiate_esessions') and gajim.config.get_per(
self.contact.jid, 'autonegotiate_esessions') 'contacts', self.contact.jid, 'autonegotiate_esessions')
want_e2e = not e2e_is_active and not self.gpg_is_active \ want_e2e = not e2e_is_active and not self.gpg_is_active \
and e2e_pref and e2e_pref