copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

do not try to connect to server over a plain (unencrypted) connexion by default. see #8193

Browse source
This commit is contained in:
Yann Leboulanger 2015-11-22 20:09:54 +01:00
parent 4d70aa91e7
commit 70865447b2
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/defs.py
View file

@ -27,7 +27,7 @@ docdir = '../'
basedir = '../' basedir = '../'
localedir = '../po' localedir = '../po'
version = '0.16.4' version = '0.16.4.1'
import subprocess import subprocess
try: try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

18
src/common/optparser.py
View file

@ -73,8 +73,13 @@ class OptionsParser:
gajim.config.set(optname, value) gajim.config.set(optname, value)
else: else:
if (optname, key) not in seen: 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) gajim.config.add_per(optname, key)
seen.add((optname, key)) seen.add((optname, key))
self.old_values[optname][key][subname] = value
gajim.config.set_per(optname, key, subname, value) gajim.config.set_per(optname, key, subname, value)
old_version = gajim.config.get('version') old_version = gajim.config.get('version')
@ -224,6 +229,8 @@ class OptionsParser:
self.update_config_to_014900() self.update_config_to_014900()
if old < [0, 16, 0, 1] and new >= [0, 16, 0, 1]: if old < [0, 16, 0, 1] and new >= [0, 16, 0, 1]:
self.update_config_to_01601() 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.init_vars()
gajim.logger.attach_cache_database() gajim.logger.attach_cache_database()
@ -919,3 +926,14 @@ class OptionsParser:
gajim.config.set_per('accounts', account, 'last_mam_id', gajim.config.set_per('accounts', account, 'last_mam_id',
last_mam_id) last_mam_id)
gajim.config.set('version', '0.16.0.1') 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')