Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
poezio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
203
Issues
203
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poezio
poezio
Commits
9f1e80cd
Commit
9f1e80cd
authored
Jan 29, 2021
by
mathieui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove force_remote_bookmarks option
It is 2021, servers ought to not be broken that much.
parent
b2c846f9
Pipeline
#3593
passed with stages
in 5 minutes
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
29 deletions
+1
-29
data/default_config.cfg
data/default_config.cfg
+0
-4
doc/source/configuration.rst
doc/source/configuration.rst
+0
-7
poezio/bookmarks.py
poezio/bookmarks.py
+1
-17
poezio/config.py
poezio/config.py
+0
-1
No files found.
data/default_config.cfg
View file @
9f1e80cd
...
@@ -132,10 +132,6 @@ use_bookmarks_method =
...
@@ -132,10 +132,6 @@ use_bookmarks_method =
# possible values are: anything/false
# possible values are: anything/false
#use_remote_bookmarks = true
#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
# Whether you want all bookmarks, even those without
# autojoin, to be open on startup
# autojoin, to be open on startup
#open_all_bookmarks = false
#open_all_bookmarks = false
...
...
doc/source/configuration.rst
View file @
9f1e80cd
...
@@ -384,13 +384,6 @@ to understand what is :ref:`carbons <carbons-details>` or
...
@@ -384,13 +384,6 @@ to understand what is :ref:`carbons <carbons-details>` or
This was previously named ``bookmark_on_join``.
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
use_bookmark_method
**Default value:** ``[empty]``
**Default value:** ``[empty]``
...
...
poezio/bookmarks.py
View file @
9f1e80cd
...
@@ -279,25 +279,9 @@ class BookmarkList:
...
@@ -279,25 +279,9 @@ class BookmarkList:
def
get_remote
(
self
,
xmpp
,
information
,
callback
):
def
get_remote
(
self
,
xmpp
,
information
,
callback
):
"""Add the remotely stored bookmarks to the list."""
"""Add the remotely stored bookmarks to the list."""
force
=
config
.
get
(
'force_remote_bookmarks'
)
if
xmpp
.
anon
or
not
any
(
self
.
available_storage
.
values
()):
if
xmpp
.
anon
or
not
(
any
(
self
.
available_storage
.
values
())
or
force
):
information
(
'No remote bookmark storage available'
,
'Warning'
)
information
(
'No remote bookmark storage available'
,
'Warning'
)
return
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'
:
if
self
.
preferred
==
'pep'
:
self
.
get_pep
(
xmpp
,
callback
=
callback
)
self
.
get_pep
(
xmpp
,
callback
=
callback
)
else
:
else
:
...
...
poezio/config.py
View file @
9f1e80cd
...
@@ -73,7 +73,6 @@ DEFAULT_CONFIG = {
...
@@ -73,7 +73,6 @@ DEFAULT_CONFIG = {
'extract_inline_images'
:
True
,
'extract_inline_images'
:
True
,
'filter_info_messages'
:
''
,
'filter_info_messages'
:
''
,
'force_encryption'
:
True
,
'force_encryption'
:
True
,
'force_remote_bookmarks'
:
False
,
'go_to_previous_tab_on_alt_number'
:
False
,
'go_to_previous_tab_on_alt_number'
:
False
,
'group_corrections'
:
True
,
'group_corrections'
:
True
,
'hide_exit_join'
:
-
1
,
'hide_exit_join'
:
-
1
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment