copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check server features in correct stanza

This commit is contained in:
Yann Leboulanger 2010-09-03 11:29:15 +02:00
parent ea957fe015
commit 8d6ff98ee9
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/common/connection_handlers.py
View File

@ -359,32 +359,33 @@ class ConnectionDisco:
'pep': 'pep':
self.pep_supported = True self.pep_supported = True
break break
if features.__contains__(common.xmpp.NS_VCARD): if features.__contains__(common.xmpp.NS_VCARD):
self.vcard_supported = True self.vcard_supported = True
if features.__contains__(common.xmpp.NS_PUBSUB): if features.__contains__(common.xmpp.NS_PUBSUB):
self.pubsub_supported = True self.pubsub_supported = True
if features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): if features.__contains__(
self.pubsub_publish_options_supported = True common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS):
else: self.pubsub_publish_options_supported = True
# Remove stored bookmarks accessible to everyone. else:
our_jid = gajim.get_jid_from_account(self.name) # Remove stored bookmarks accessible to everyone.
self.send_pb_purge(our_jid, 'storage:bookmarks') our_jid = gajim.get_jid_from_account(self.name)
self.send_pb_delete(our_jid, 'storage:bookmarks') self.send_pb_purge(our_jid, 'storage:bookmarks')
if features.__contains__(common.xmpp.NS_ARCHIVE): self.send_pb_delete(our_jid, 'storage:bookmarks')
self.archiving_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE):
if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO): self.archiving_supported = True
self.archive_auto_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO):
if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE): self.archive_auto_supported = True
self.archive_manage_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE):
if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL): self.archive_manage_supported = True
self.archive_manual_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL):
if features.__contains__(common.xmpp.NS_ARCHIVE_PREF): self.archive_manual_supported = True
self.archive_pref_supported = True if features.__contains__(common.xmpp.NS_ARCHIVE_PREF):
self.archive_pref_supported = True
if features.__contains__(common.xmpp.NS_BYTESTREAM): if features.__contains__(common.xmpp.NS_BYTESTREAM):
our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\ our_jid = helpers.parse_jid(gajim.get_jid_from_account(
'/' + self.server_resource) self.name) + '/' + self.server_resource)
gajim.proxy65_manager.resolve(jid, self.connection, our_jid, gajim.proxy65_manager.resolve(jid, self.connection, our_jid,
self.name) self.name)
if features.__contains__(common.xmpp.NS_MUC) and is_muc: if features.__contains__(common.xmpp.NS_MUC) and is_muc:
type_ = transport_type or 'jabber' type_ = transport_type or 'jabber'
self.muc_jid[type_] = jid self.muc_jid[type_] = jid
@ -2350,4 +2351,4 @@ ConnectionJingle, ConnectionIBBytestream):
con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('iq', self._ResultCB, 'result')
con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('presence', self._StanzaArrivedCB)
con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB)
con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams')