make esessions an optional caps feature

This commit is contained in:
Brendan Taylor 2008-07-20 15:54:05 +00:00
parent 90098b1e34
commit c9b2556c41
2 changed files with 3 additions and 5 deletions

View File

@ -176,9 +176,6 @@ gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI,
'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING,
xmpp.NS_TIME_REVISED, xmpp.NS_GAMING]
if HAVE_PYCRYPTO:
gajim_common_features.append(xmpp.NS_ESESSION)
# Optional features gajim supports per account
gajim_optional_features = {}

View File

@ -1340,8 +1340,9 @@ 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:
gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION_INIT)
if gajim.HAVE_PYCRYPTO and \
gajim.config.get_per('accounts', a, 'autonegotiate_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)
gajim.caps_hash[a] = compute_caps_hash([gajim.gajim_identity],