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

fix update_config procedure. Also remove proxy65.unstable.nl proxy. Fixes #1748

Browse source
This commit is contained in:
Yann Leboulanger 2006-03-26 10:24:42 +00:00
parent 0055c36648
commit f58503f8e7
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/common/optparser.py
View file

@ -138,9 +138,9 @@ class OptionsParser:
while len(new_version): while len(new_version):
new.append(int(new_version.pop(0))) new.append(int(new_version.pop(0)))
if old < (0, 9) and new >= (0, 9): if old < [0, 9] and new >= [0, 9]:
self.update_config_x_to_09() self.update_config_x_to_09()
if old < (0, 10) and new >= (0, 10): if old < [0, 10] and new >= [0, 10]:
self.update_config_09_to_010() self.update_config_09_to_010()
def update_config_x_to_09(self): def update_config_x_to_09(self):
@ -200,6 +200,7 @@ class OptionsParser:
gajim.config.set('version', '0.9') gajim.config.set('version', '0.9')
def update_config_09_to_010(self): def update_config_09_to_010(self):
print 'update to 0.10'
if self.old_values.has_key('usetabbedchat') and not \ if self.old_values.has_key('usetabbedchat') and not \
self.old_values['usetabbedchat']: self.old_values['usetabbedchat']:
gajim.config.set('one_message_window', 'never') gajim.config.set('one_message_window', 'never')
@ -212,13 +213,20 @@ class OptionsParser:
for account in gajim.config.get_per('accounts'): for account in gajim.config.get_per('accounts'):
proxies_str = gajim.config.get_per('accounts', account, proxies_str = gajim.config.get_per('accounts', account,
'file_transfer_proxies') 'file_transfer_proxies')
proxies = proxies_str.split(",").strip() proxies = proxies_str.split(',')
print proxies
for i in range(0, len(proxies)):
proxies[i] = proxies[i].strip()
print proxies
for wrong_proxy in ['proxy.jabber.cd.chalmers.se', for wrong_proxy in ['proxy.jabber.cd.chalmers.se',
'proxy65.jabber.autocom.pl', 'proxy65.jabber.ccc.de']: 'proxy65.jabber.autocom.pl', 'proxy65.jabber.ccc.de']:
if wrong_proxy in proxies: if wrong_proxy in proxies:
proxies.remove(wrong_proxy) proxies.remove(wrong_proxy)
proxies.append('transfer.jabber.freenet.de') if not 'transfer.jabber.freenet.de' in proxies:
proxies.append('transfer.jabber.freenet.de')
print proxies
proxies_str = ', '.join(proxies) proxies_str = ', '.join(proxies)
gajim.config.set_per('accounts', account, 'file_transfer_proxies', gajim.config.set_per('accounts', account, 'file_transfer_proxies',
proxies_str) proxies_str)
gajim.config.set('version', '0.10')