Commit 63496235 authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'synchronise_open_rooms' into 'master'

Rename bookmark_on_join to synchronise_open_rooms

See merge request poezio/poezio!111
parents cfa75f88 3d912230
......@@ -141,8 +141,8 @@ use_bookmarks_method =
#open_all_bookmarks = false
# Will create a bookmark on manual /join, using your preferred
# storage method
#bookmark_on_join = false
# storage method. Use /leave to remove the bookmark.
#synchronise_open_rooms = true
# What will be put after the name, when using autocompletion at the
# beginning of the input. A space will always be added after that
......@@ -371,12 +371,18 @@ to understand what is :ref:`carbons <carbons-details>` or
sender intended it as such. See :ref:`Message Correction <correct-feature>` for
more information.
**Default value:** ``false``
**Default value:** ``true``
If ``false``, poezio will not store the state of currently open rooms,
so that if you leave a room and restart poezio (or start another
client) it will reopen it.
If ``true``, ``/join`` will create a bookmark with ``autojoin=true``,
and ``/leave`` will remove said bookmark.
If ``true``, poezio will bookmark automatically every room that is joined with
a manual ``/join`` command.
This was previously named ``bookmark_on_join``.
......@@ -38,7 +38,6 @@ DEFAULT_CONFIG = {
'autorejoin_delay': '5',
'autorejoin': False,
'beep_on': 'highlight private invite disconnect',
'bookmark_on_join': False,
'ca_cert_path': '',
'certificate': '',
'certfile': '',
......@@ -133,6 +132,7 @@ DEFAULT_CONFIG = {
'show_useless_separator': True,
'status': '',
'status_message': '',
'synchronise_open_rooms': True,
'theme': 'default',
'themes_dir': '',
'tmp_image_dir': '',
......@@ -401,7 +401,7 @@ class CommandCore:
tab.password = password
if config.get('bookmark_on_join'):
if config.get('synchronise_open_rooms'):
method = 'remote' if config.get(
'use_remote_bookmarks') else 'local'
self._add_bookmark('%s/%s' % (room, nick), True, password, method)
......@@ -1489,7 +1489,7 @@ class MucTab(ChatTab):
/leave [msg]
if config.get('bookmark_on_join'):
if config.get('synchronise_open_rooms'):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment