changeset ab4f06e5e024 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ab4f06e5e024
description: fix usage of get_per(). Fixes #7140
diffstat:
src/common/connection.py | 2 +-
src/common/helpers.py | 2 +-
src/config.py | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diffs (46 lines):
diff -r bac8e353d25c -r ab4f06e5e024 src/common/connection.py
--- a/src/common/connection.py Tue Apr 10 17:25:32 2012 +0200
+++ b/src/common/connection.py Wed Apr 11 21:30:05 2012 +0200
@@ -1024,7 +1024,7 @@
proxy = {}
proxyptr = gajim.config.get_per('proxies', p)
for key in proxyptr.keys():
- proxy[key] = proxyptr[key][1]
+ proxy[key] = proxyptr[key]
else:
proxy = None
use_srv = True
diff -r bac8e353d25c -r ab4f06e5e024 src/common/helpers.py
--- a/src/common/helpers.py Tue Apr 10 17:25:32 2012 +0200
+++ b/src/common/helpers.py Wed Apr 11 21:30:05 2012 +0200
@@ -1435,7 +1435,7 @@
if not proxyptr:
return proxy
for key in proxyptr.keys():
- proxy[key] = proxyptr[key][1]
+ proxy[key] = proxyptr[key]
return proxy
def _get_img_direct(attrs):
diff -r bac8e353d25c -r ab4f06e5e024 src/config.py
--- a/src/config.py Tue Apr 10 17:25:32 2012 +0200
+++ b/src/config.py Wed Apr 11 21:30:05 2012 +0200
@@ -1485,8 +1485,7 @@
gajim.config.del_per('proxies', old_name)
gajim.config.add_per('proxies', new_name)
for option in config:
- gajim.config.set_per('proxies', new_name, option,
- config[option][common.config.OPT_VAL])
+ gajim.config.set_per('proxies', new_name, option, config[option])
model.set_value(iter_, 0, new_name)
def on_proxytype_combobox_changed(self, widget):
@@ -2116,7 +2115,7 @@
gajim.config.add_per('accounts', new_name)
old_config = gajim.config.get_per('accounts', old_name)
for opt in old_config:
- gajim.config.set_per('accounts', new_name, opt,
old_config[opt][1])
+ gajim.config.set_per('accounts', new_name, opt,
old_config[opt])
gajim.config.del_per('accounts', old_name)
if self.current_account == old_name:
self.current_account = new_name
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
