summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2013-06-08 12:28:07 +0200
committermathieui <mathieui@mathieui.net>2013-06-08 12:28:07 +0200
commit545e67c500595c3bb72ed18791717781e4b1581e (patch)
treef7a7a60b05b8c39010dddf9eb75a1c4c723eb9a1
parent463ec5ca0d904f62afac9ef5c6c146d9490103c5 (diff)
downloadpoezio-545e67c500595c3bb72ed18791717781e4b1581e.tar.gz
poezio-545e67c500595c3bb72ed18791717781e4b1581e.tar.bz2
poezio-545e67c500595c3bb72ed18791717781e4b1581e.tar.xz
poezio-545e67c500595c3bb72ed18791717781e4b1581e.zip
Fix setting autojoin with /bookmark
-rw-r--r--src/bookmark.py2
-rw-r--r--src/core.py7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/bookmark.py b/src/bookmark.py
index f950154d..95d20734 100644
--- a/src/bookmark.py
+++ b/src/bookmark.py
@@ -44,7 +44,7 @@ class Bookmark(object):
self._method = value
def __repr__(self):
- return '<%s>' % self.jid
+ return '<%s%s%s>' % (self.jid, ('/'+self.nick) if self.nick else '', '|autojoin' if self.autojoin else '')
def stanza(self):
"""
diff --git a/src/core.py b/src/core.py
index 2605aeb6..fc3a5458 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1920,7 +1920,7 @@ class Core(object):
password = None
elif args[0] == '*':
if len(args) > 1:
- autojoin = False if args[1].lower() == 'false' else True
+ autojoin = False if args[1].lower() != 'true' else True
else:
autojoin = True
for tab in self.tabs:
@@ -1948,7 +1948,7 @@ class Core(object):
return
roomname = self.current_tab().get_name()
if len(args) > 1:
- autojoin = False if args[1].lower() == 'false' else True
+ autojoin = False if args[1].lower() != 'true' else True
else:
autojoin = True
if len(args) > 2:
@@ -1964,8 +1964,7 @@ class Core(object):
bm.nick = nick
if password:
bm.password = password
- if autojoin:
- bm.autojoin = autojoin
+ bm.autojoin = autojoin
if bookmark.save_remote(self.xmpp):
self.information('Bookmark added.', 'Info')
self.information(_('Your remote bookmarks are now: %s') %