Changeset 9971

Show
Ignore:
Timestamp:
07/20/08 17:54:05 (7 weeks ago)
Author:
bct
Message:

make esessions an optional caps feature

Location:
trunk/src/common
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/common/gajim.py

    r9926 r9971  
    176176        'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, 
    177177        xmpp.NS_TIME_REVISED, xmpp.NS_GAMING] 
    178  
    179 if HAVE_PYCRYPTO: 
    180         gajim_common_features.append(xmpp.NS_ESESSION) 
    181178 
    182179# Optional features gajim supports per account 

  • trunk/src/common/helpers.py

    r9846 r9971  
    13411341                if not gajim.config.get('ignore_incoming_xhtml'): 
    13421342                        gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM) 
    1343                 if gajim.HAVE_PYCRYPTO: 
    1344                         gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION_INIT) 
     1343                if gajim.HAVE_PYCRYPTO and \ 
     1344                gajim.config.get_per('accounts', a, 'autonegotiate_esessions'): 
     1345                        gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) 
    13451346                if gajim.config.get_per('accounts', a, 'answer_receipts'): 
    13461347                        gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS)