Possibility to disable ESessions (not only autonegotiation) per account

src/common/config.py

@@ -278,6 +278,7 @@ class Config:
 			'keyid': [ opt_str, '', '', True ],
 			'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ],
 			'keyname': [ opt_str, '', '', True ],
+			'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')],
 			'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')],
 			'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')],
 			'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ],

src/common/helpers.py

@@ -1346,7 +1346,8 @@ def update_optional_features(account = None):
 			gajim.gajim_optional_features[a].append(xmpp.NS_CHATSTATES)
 		if not gajim.config.get('ignore_incoming_xhtml'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM)
-		if gajim.HAVE_PYCRYPTO:
+		if gajim.HAVE_PYCRYPTO \
+		and gajim.config.get_per('accounts', a, 'enable_esessions'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION)
 		if gajim.config.get_per('accounts', a, 'answer_receipts'):
 			gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS)