diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2012-04-11 23:30:05 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2012-04-11 23:30:05 +0400 |
| commit | 9a6519373f609b4a4c4fa8655a9afc1bff2379b1 (patch) | |
| tree | 41e0d47b827138cbbed216b44c43cd908244a8f3 | |
| parent | b5c424a96f06af5cbab2da1c4a99d82002319c1f (diff) | |
fix usage of get_per(). Fixes #7140
| -rw-r--r-- | src/common/connection.py | 2 | ||||
| -rw-r--r-- | src/common/helpers.py | 2 | ||||
| -rw-r--r-- | src/config.py | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/common/connection.py b/src/common/connection.py index edd53ee4a..4359fffff 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1024,7 +1024,7 @@ class Connection(CommonConnection, ConnectionHandlers): 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 --git a/src/common/helpers.py b/src/common/helpers.py index ce902b007..a98110009 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1435,7 +1435,7 @@ def get_proxy_info(account): 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 --git a/src/config.py b/src/config.py index dc597d566..6f95fd215 100644 --- a/src/config.py +++ b/src/config.py @@ -1485,8 +1485,7 @@ class ManageProxiesWindow: 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 @@ class AccountsWindow: 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 |