Author: bct Date: 2008-07-20 17:54:05 +0200 (Sun, 20 Jul 2008) New Revision: 9971

Modified: trunk/src/common/gajim.py trunk/src/common/helpers.py Log: make esessions an optional caps feature

Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-20 15:06:21 UTC (rev 9970) +++ trunk/src/common/gajim.py 2008-07-20 15:54:05 UTC (rev 9971) @@ -176,9 +176,6 @@ '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 = {}

Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-20 15:06:21 UTC (rev 9970) +++ trunk/src/common/helpers.py 2008-07-20 15:54:05 UTC (rev 9971) @@ -1340,8 +1340,9 @@ 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],