pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a new option 'use_remote_bookmarks' to force local bookmarks if

Browse source 
needed
This commit is contained in:
mathieui 2011-11-27 13:02:08 +01:00
parent ea0f191555
commit 96a9a88384
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core.py
View file

@ -572,7 +572,7 @@ class Core(object):
self.events.trigger('send_normal_presence', pres) self.events.trigger('send_normal_presence', pres)
pres.send() pres.send()
bookmark.get_local() bookmark.get_local()
if not self.xmpp.anon: if not self.xmpp.anon and not config.get('use_remote_bookmarks', 'true').lower() == 'false':
bookmark.get_remote(self.xmpp) bookmark.get_remote(self.xmpp)
for bm in [item for item in bookmark.bookmarks if item.autojoin]: for bm in [item for item in bookmark.bookmarks if item.autojoin]:
tab = self.get_tab_by_name(bm.jid, tabs.MucTab) tab = self.get_tab_by_name(bm.jid, tabs.MucTab)
@ -1714,6 +1714,9 @@ class Core(object):
""" """
/bookmark [room][/nick] [autojoin] [password] /bookmark [room][/nick] [autojoin] [password]
""" """
if config.get('use_remote_bookmarks', 'true').lower() == 'false':
self.command_bookmark_local(arg)
return
args = common.shell_split(arg) args = common.shell_split(arg)
nick = None nick = None
if len(args) == 0 and not isinstance(self.current_tab(), tabs.MucTab): if len(args) == 0 and not isinstance(self.current_tab(), tabs.MucTab):