electrum

commit 824e16e0b3b979197e9a225945c1d3e3e0ac039d
parent fe5be618db35eb8b2148865e2bdff350a062ff58
Author: ThomasV <electrumdev@gmail.com>
Date:   Sun, 10 May 2015 22:47:52 +0200

Merge pull request #1210 from venzen/master

gui/text.py curses GUI bug fixes
Diffstat:
M
gui/text.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gui/text.py b/gui/text.py
@@ -353,7 +353,7 @@ class ElectrumGui:
     def network_dialog(self):
         if not self.network: return
         auto_connect = self.network.config.get('auto_cycle')
-        host, port, protocol = self.network.default_server.split(':')
+        host, port, protocol, proxy_config, auto_connect = self.network.get_parameters()
         srv = 'auto-connect' if auto_connect else self.network.default_server
 
         out = self.run_dialog('Network', [
@@ -383,7 +383,7 @@ class ElectrumGui:
     def settings_dialog(self):
         out = self.run_dialog('Settings', [
             {'label':'Default GUI', 'type':'list', 'choices':['classic','lite','gtk','text'], 'value':self.config.get('gui')},
-            {'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.wallet.fee).strip() }
+            {'label':'Default fee', 'type':'satoshis', 'value': format_satoshis(self.wallet.fee_per_kb).strip() }
             ], buttons = 1)
         if out:
             if out.get('Default GUI'):