From e86ecb3a529f30123df376ca44da932288b24831 Mon Sep 17 00:00:00 2001 From: mathieui Date: Mon, 14 May 2012 00:01:19 +0200 Subject: =?UTF-8?q?Fix=20the=20=E2=80=9C/bookmark{,=5Flocal}=20*=E2=80=9D?= =?UTF-8?q?=20behaviour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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") -- cgit v1.2.3