From 8ed33a3227ee3df1d78dc207de41f9bf15cd36d2 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Mon, 3 Jan 2011 21:41:17 +0300 Subject: [PATCH] [Link Mauve] fix for bookmarks(XEP-0048) --- src/common/connection_handlers_events.py | 8 +++++++- src/common/xmpp/protocol.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py index d4d549196..31f3e051b 100644 --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -461,7 +461,13 @@ class PrivateStorageReceivedEvent(nec.NetworkIncomingEvent): class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] - confs = self.base_event.storage_node.getTags('conference') + try: + storage = self.base_event.item_node.getTag('storage', + namespace=xmpp.NS_BOOKMARKS) + except AttributeError: + storage = self.base_event.storage_node + confs = storage.getTags('conference') + for conf in confs: autojoin_val = conf.getAttr('autojoin') if autojoin_val is None: # not there (it's optional) diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py index a9cb0eda0..2356a5ae6 100644 --- a/src/common/xmpp/protocol.py +++ b/src/common/xmpp/protocol.py @@ -38,6 +38,7 @@ NS_AUTH ='jabber:iq:auth' NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' NS_BOB ='urn:xmpp:bob' #XEP-0231 +NS_BOOKMARKS ='storage:bookmarks' #XEP-0048 NS_BROWSE ='jabber:iq:browse' NS_BROWSING ='http://jabber.org/protocol/browsing' # XEP-0195 NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065