Changeset 10020

Show
Ignore:
Timestamp:
07/25/08 00:13:59 (5 weeks ago)
Author:
js
Message:

Possibility to disable ESessions (not only autonegotiation) per account

Location:
trunk/src/common
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/common/config.py

    r10018 r10020  
    279279                        'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ], 
    280280                        'keyname': [ opt_str, '', '', True ], 
     281                        'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 
    281282                        'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 
    282283                        'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 

  • trunk/src/common/helpers.py

    r9986 r10020  
    13471347                if not gajim.config.get('ignore_incoming_xhtml'): 
    13481348                        gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM) 
    1349                 if gajim.HAVE_PYCRYPTO: 
     1349                if gajim.HAVE_PYCRYPTO \ 
     1350                and gajim.config.get_per('accounts', a, 'enable_esessions'): 
    13501351                        gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) 
    13511352                if gajim.config.get_per('accounts', a, 'answer_receipts'):