changeset ec96e9f90375 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ec96e9f90375
description: stop saving bookmarks in pubsub if server doesn't support
#publish-options. see #5787
diffstat:
src/common/connection.py | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diffs (37 lines):
diff -r f31ced32a647 -r ec96e9f90375 src/common/connection.py
--- a/src/common/connection.py Mon Jun 21 10:09:00 2010 +0200
+++ b/src/common/connection.py Mon Jun 21 19:15:08 2010 +0200
@@ -1899,21 +1899,19 @@
if bm.get('print_status', None):
iq2.setTagData('print_status', bm['print_status'])
- if self.pubsub_supported and storage_type != 'xml':
- if self.pubsub_publish_options_supported:
- options = common.xmpp.Node(common.xmpp.NS_DATA + ' x',
- attrs={'type': 'submit'})
- f = options.addChild('field', attrs={'var': 'FORM_TYPE',
- 'type': 'hidden'})
- f.setTagData('value', common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS)
- f = options.addChild('field', attrs={'var':
'pubsub#persist_items'})
- f.setTagData('value', 'true')
- f = options.addChild('field', attrs={'var':
'pubsub#access_model'})
- f.setTagData('value', 'whitelist')
- else:
- options = None
+ if self.pubsub_supported and self.pubsub_publish_options_supported and
\
+ storage_type != 'xml':
+ options = common.xmpp.Node(common.xmpp.NS_DATA + ' x',
+ attrs={'type': 'submit'})
+ f = options.addChild('field', attrs={'var': 'FORM_TYPE',
+ 'type': 'hidden'})
+ f.setTagData('value', common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS)
+ f = options.addChild('field', attrs={'var':
'pubsub#persist_items'})
+ f.setTagData('value', 'true')
+ f = options.addChild('field', attrs={'var': 'pubsub#access_model'})
+ f.setTagData('value', 'whitelist')
self.send_pb_publish('', 'storage:bookmarks', iq, 'current',
- options=options)
+ options=options)
if storage_type != 'pubsub':
iqA = common.xmpp.Iq(typ='set')
iqB = iqA.addChild(name='query', namespace=common.xmpp.NS_PRIVATE)
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
