Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Weblate
gajim
Commits
060da2b4
Commit
060da2b4
authored
9 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
do not try to connect to server over a plain (unencrypted) connexion by default. see #8193
parent
0aee7bb3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/common/defs.py
+1
-1
1 addition, 1 deletion
src/common/defs.py
src/common/optparser.py
+18
-0
18 additions, 0 deletions
src/common/optparser.py
with
19 additions
and
1 deletion
src/common/defs.py
+
1
−
1
View file @
060da2b4
...
...
@@ -27,7 +27,7 @@ docdir = '../'
basedir
=
'
../
'
localedir
=
'
../po
'
version
=
'
0.16.4
'
version
=
'
0.16.4
.1
'
import
subprocess
try
:
node
=
subprocess
.
Popen
(
'
hg tip --template
"
{node|short}
"'
,
shell
=
True
,
...
...
This diff is collapsed.
Click to expand it.
src/common/optparser.py
+
18
−
0
View file @
060da2b4
...
...
@@ -76,8 +76,13 @@ class OptionsParser:
gajim
.
config
.
set
(
optname
,
value
)
else
:
if
(
optname
,
key
)
not
in
seen
:
if
optname
in
self
.
old_values
:
self
.
old_values
[
optname
][
key
]
=
{}
else
:
self
.
old_values
[
optname
]
=
{
key
:
{}}
gajim
.
config
.
add_per
(
optname
,
key
)
seen
.
add
((
optname
,
key
))
self
.
old_values
[
optname
][
key
][
subname
]
=
value
gajim
.
config
.
set_per
(
optname
,
key
,
subname
,
value
)
old_version
=
gajim
.
config
.
get
(
'
version
'
)
...
...
@@ -234,6 +239,8 @@ class OptionsParser:
self
.
update_config_to_014900
()
if
old
<
[
0
,
16
,
0
,
1
]
and
new
>=
[
0
,
16
,
0
,
1
]:
self
.
update_config_to_01601
()
if
old
<
[
0
,
16
,
4
,
1
]
and
new
>=
[
0
,
16
,
4
,
1
]:
self
.
update_config_to_01641
()
gajim
.
logger
.
init_vars
()
gajim
.
logger
.
attach_cache_database
()
...
...
@@ -929,3 +936,14 @@ class OptionsParser:
gajim
.
config
.
set_per
(
'
accounts
'
,
account
,
'
last_mam_id
'
,
last_mam_id
)
gajim
.
config
.
set
(
'
version
'
,
'
0.16.0.1
'
)
def
update_config_to_01641
(
self
):
print
self
.
old_values
[
'
accounts
'
].
keys
()
for
account
in
self
.
old_values
[
'
accounts
'
].
keys
():
connection_types
=
self
.
old_values
[
'
accounts
'
][
account
][
'
connection_types
'
].
split
()
if
'
plain
'
in
connection_types
and
len
(
connection_types
)
>
1
:
connection_types
.
remove
(
'
plain
'
)
gajim
.
config
.
set_per
(
'
accounts
'
,
account
,
'
connection_types
'
,
'
'
.
join
(
connection_types
))
gajim
.
config
.
set
(
'
version
'
,
'
0.16.4.1
'
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment