Author: js Date: 2008-07-25 00:13:59 +0200 (Fri, 25 Jul 2008) New Revision: 10020

Modified: trunk/src/common/config.py trunk/src/common/helpers.py Log: Possibility to disable ESessions (not only autonegotiation) per account

Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-24 22:13:37 UTC (rev 10019) +++ trunk/src/common/config.py 2008-07-24 22:13:59 UTC (rev 10020) @@ -278,6 +278,7 @@ '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.') ],

Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-24 22:13:37 UTC (rev 10019) +++ trunk/src/common/helpers.py 2008-07-24 22:13:59 UTC (rev 10020) @@ -1346,7 +1346,8 @@ 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)