electrum

commit 3760486a6a9279ffbd852f0be43c8f7a823a9427
parent fb6a1a0720dea8aec4fbd9e42a29eb78b1c7e50d
Author: thomasv <thomasv@gitorious>
Date:   Fri, 19 Oct 2012 11:02:22 +0200

fix side effect and handle case where the initial server was not connected

Diffstat:
M
lib/gui_qt.py
 | 
35
+++++++++++++++++------------------

1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/lib/gui_qt.py b/lib/gui_qt.py
@@ -1383,12 +1383,12 @@ class ElectrumWindow(QMainWindow):
             
         plist = {}
         for item in servers_list:
-            host, pp = item
+            _host, pp = item
             z = {}
             for item2 in pp:
-                protocol, port = item2
-                z[protocol] = port
-            plist[host] = z
+                _protocol, _port = item2
+                z[_protocol] = _port
+            plist[_host] = z
 
         d = QDialog(parent)
         d.setModal(1)
@@ -1424,13 +1424,13 @@ class ElectrumWindow(QMainWindow):
         protocol_letters = 'thsg'
         server_protocol.addItems(protocol_names)
 
-        host, port, protocol = server.split(':')
-
         grid.addWidget(QLabel(_('Server') + ':'), 0, 0)
         grid.addWidget(server_protocol, 0, 1)
         grid.addWidget(server_host, 0, 2)
         grid.addWidget(server_port, 0, 3)
 
+        host, port, protocol = server.split(':')
+
         def change_protocol(p):
             protocol = protocol_letters[p]
             host = unicode(server_host.text())
@@ -1442,32 +1442,31 @@ class ElectrumWindow(QMainWindow):
             server_port.setText( port )
 
         server_protocol.connect(server_protocol, SIGNAL('currentIndexChanged(int)'), change_protocol)
-
-        
-        if wallet.interface.servers:
-            label = _('Active Servers')
-        else:
-            label = _('Default Servers')
         
+        label = _('Active Servers') if wallet.interface.servers else _('Default Servers')
         servers_list_widget = QTreeWidget(parent)
         servers_list_widget.setHeaderLabels( [ label ] )
         servers_list_widget.setMaximumHeight(150)
-        for host in plist.keys():
-            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ host ] ))
+        for _host in plist.keys():
+            servers_list_widget.addTopLevelItem(QTreeWidgetItem( [ _host ] ))
+
 
         def change_server(host, protocol=None):
-            
-            pp = plist[host]
+            pp = plist.get(host,{})
             if protocol:
                 port = pp.get(protocol)
                 if not port: protocol = None
                     
             if not protocol:
-                if 't' in pp.keys():
+                if not pp:
+                    protocol = 't'
+                    port = '50001'
+                elif 't' in pp.keys():
                     protocol = 't'
+                    port = pp.get(protocol)
                 else:
                     protocol = pp.keys()[0]
-                port = pp.get(protocol)
+                    port = pp.get(protocol)
 
             
             server_host.setText( host )