changeset f09377c97f04 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f09377c97f04 description: check server features in correct stanza

diffstat:

src/common/connection_handlers.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-)

diffs (41 lines):

diff -r 8edc45e9a637 -r f09377c97f04 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Sep 03 08:01:37 2010 +0200 +++ b/src/common/connection_handlers.py Fri Sep 03 11:29:15 2010 +0200 @@ -348,22 +348,23 @@ 'pep': self.pep_supported = True break - if features.__contains__(common.xmpp.NS_VCARD): - self.vcard_supported = True - if features.__contains__(common.xmpp.NS_PUBSUB): - self.pubsub_supported = True - if features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): - self.pubsub_publish_options_supported = True - else: - # Remove stored bookmarks accessible to everyone. - our_jid = gajim.get_jid_from_account(self.name) - self.send_pb_purge(our_jid, 'storage:bookmarks') - self.send_pb_delete(our_jid, 'storage:bookmarks') + if features.__contains__(common.xmpp.NS_VCARD): + self.vcard_supported = True + if features.__contains__(common.xmpp.NS_PUBSUB): + self.pubsub_supported = True + if features.__contains__( + common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): + self.pubsub_publish_options_supported = True + else: + # Remove stored bookmarks accessible to everyone. + our_jid = gajim.get_jid_from_account(self.name) + self.send_pb_purge(our_jid, 'storage:bookmarks') + self.send_pb_delete(our_jid, 'storage:bookmarks') if features.__contains__(common.xmpp.NS_BYTESTREAM): - our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\ - '/' + self.server_resource) + our_jid = helpers.parse_jid(gajim.get_jid_from_account( + self.name) + '/' + self.server_resource) gajim.proxy65_manager.resolve(jid, self.connection, our_jid, - self.name) + self.name) if features.__contains__(common.xmpp.NS_MUC) and is_muc: type_ = transport_type or 'jabber' self.muc_jid[type_] = jid