diff options
author | mathieui <mathieui@mathieui.net> | 2012-04-27 23:09:26 +0200 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2012-04-27 23:09:26 +0200 |
commit | de63a1affdb57f521ab2e7a3e89182c79c1ebe2f (patch) | |
tree | cc983fc5a360cae7e922f2c707b834af20b50cab /src/bookmark.py | |
parent | 2488216fbaa6c4a9b1f264ca455665ae1675a151 (diff) | |
parent | 2a3434b1f81bed7e6c781a9504a87905f2d07948 (diff) | |
download | poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.gz poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.bz2 poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.tar.xz poezio-de63a1affdb57f521ab2e7a3e89182c79c1ebe2f.zip |
Roster update: Merge branch 'master' of https://git.louiz.org/poezio
Conflicts:
src/core.py
src/tabs.py
Diffstat (limited to 'src/bookmark.py')
-rw-r--r-- | src/bookmark.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bookmark.py b/src/bookmark.py index 38979697..95f42dd8 100644 --- a/src/bookmark.py +++ b/src/bookmark.py @@ -124,7 +124,7 @@ def save_privatexml(xmpp): """"Save the remote bookmarks with privatexml.""" xmpp.plugin['xep_0048'].set_bookmarks_old(stanza_storage('privatexml')) -def save_remote(xmpp, method="privatexml"): +def save_remote(xmpp, method=preferred): """Save the remote bookmarks.""" method = "privatexml" if method != 'pep' else 'pep' |