summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2012-05-14 00:01:19 +0200
committermathieui <mathieui@mathieui.net>2012-05-14 00:01:19 +0200
commite86ecb3a529f30123df376ca44da932288b24831 (patch)
tree331b206a8f03ab015695ba6d2a110d584c0aba4c /src
parentecc40fdc5efc873f87ff10f313f3045dbdf70363 (diff)
downloadpoezio-e86ecb3a529f30123df376ca44da932288b24831.tar.gz
poezio-e86ecb3a529f30123df376ca44da932288b24831.tar.bz2
poezio-e86ecb3a529f30123df376ca44da932288b24831.tar.xz
poezio-e86ecb3a529f30123df376ca44da932288b24831.zip
Fix the “/bookmark{,_local} *” behaviour
Diffstat (limited to 'src')
-rw-r--r--src/core.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core.py b/src/core.py
index 7fad4a63..140a3bb9 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1935,6 +1935,7 @@ class Core(object):
else:
b.method = "local"
bookmark.save_local()
+ bookmark.save_remote(self.xmpp)
self.information('Bookmarks added and saved.', 'Info')
return
else:
@@ -1990,11 +1991,13 @@ class Core(object):
if isinstance(tab, tabs.MucTab):
b = bookmark.get_by_jid(tab.get_name())
if not b:
- b = bookmark.Bookmark(tab.get_name(), autojoin=autojoin)
+ b = bookmark.Bookmark(tab.get_name(), autojoin=autojoin,
+ method=bookmark.preferred)
bookmark.bookmarks.append(b)
else:
- b.method = "local"
+ b.method = bookmark.preferred
if bookmark.save_remote(self.xmpp, self):
+ bookmark.save_local()
self.information("Bookmarks added.", "Info")
else:
self.information("Could not add the bookmarks.", "Info")