summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/default_config.cfg4
-rw-r--r--doc/source/configuration.rst7
-rw-r--r--poezio/bookmarks.py18
-rw-r--r--poezio/config.py1
4 files changed, 1 insertions, 29 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index 9f65f017..89b5f514 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -132,10 +132,6 @@ use_bookmarks_method =
# possible values are: anything/false
#use_remote_bookmarks = true
-# Force the retrieval of the remote bookmarks even when the server
-# doesn't advertise support for your method
-#force_remote_bookmarks = false
-
# Whether you want all bookmarks, even those without
# autojoin, to be open on startup
#open_all_bookmarks = false
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 0b3ee576..3199ff53 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -384,13 +384,6 @@ to understand what is :ref:`carbons <carbons-details>` or
This was previously named ``bookmark_on_join``.
- force_remote_bookmarks
-
- **Default value:** ``false``
-
- Try to retrieve your remote bookmarks, even when your server doesn’t advertise
- support.
-
use_bookmark_method
**Default value:** ``[empty]``
diff --git a/poezio/bookmarks.py b/poezio/bookmarks.py
index 4ce06cf0..d95e8fd5 100644
--- a/poezio/bookmarks.py
+++ b/poezio/bookmarks.py
@@ -279,25 +279,9 @@ class BookmarkList:
def get_remote(self, xmpp, information, callback):
"""Add the remotely stored bookmarks to the list."""
- force = config.get('force_remote_bookmarks')
- if xmpp.anon or not (any(self.available_storage.values()) or force):
+ if xmpp.anon or not any(self.available_storage.values()):
information('No remote bookmark storage available', 'Warning')
return
-
- if force and not any(self.available_storage.values()):
- old_callback = callback
- method = 'pep' if self.preferred == 'pep' else 'privatexml'
-
- def new_callback(result):
- if result['type'] != 'error':
- self.available_storage[method] = True
- old_callback(result)
- else:
- information('No remote bookmark storage available',
- 'Warning')
-
- callback = new_callback
-
if self.preferred == 'pep':
self.get_pep(xmpp, callback=callback)
else:
diff --git a/poezio/config.py b/poezio/config.py
index 78581775..00d0b2f7 100644
--- a/poezio/config.py
+++ b/poezio/config.py
@@ -73,7 +73,6 @@ DEFAULT_CONFIG = {
'extract_inline_images': True,
'filter_info_messages': '',
'force_encryption': True,
- 'force_remote_bookmarks': False,
'go_to_previous_tab_on_alt_number': False,
'group_corrections': True,
'hide_exit_join': -1,