electrum

commit 96e2a3d7e1ee7cada1da0d03bf1c089e4abba307
parent 6f15772a9425dccf7053b310fc2681294b648f71
Author: thomasv <thomasv@gitorious>
Date:   Thu,  9 Feb 2012 15:39:25 +0100

servers thread

Diffstat:
M
client/electrum
 | 
1
+
M
client/gui.py
 | 
2
--
M
client/interface.py
 | 
4
+++-
M
client/version.py
 | 
2
+-

4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/client/electrum b/client/electrum
@@ -59,6 +59,7 @@ if __name__ == '__main__':
 
     if cmd == 'gui' or re.match('^bitcoin:', cmd):
         import gui
+        interface.get_servers()
         gui.init_wallet(wallet)
         gui = gui.BitcoinGUI(wallet)
         interface.start(wallet)
diff --git a/client/gui.py b/client/gui.py
@@ -105,7 +105,6 @@ def init_wallet(wallet):
             wallet.new_seed(None)
 
             # ask for the server.
-            wallet.interface.get_servers()
             run_network_dialog( wallet, parent=None )
 
             # generate first key
@@ -119,7 +118,6 @@ def init_wallet(wallet):
 
         else:
             # ask for the server.
-            wallet.interface.get_servers()
             run_network_dialog( wallet, parent=None )
 
             # ask for seed and gap.
diff --git a/client/interface.py b/client/interface.py
@@ -27,7 +27,7 @@ class Interface:
     def __init__(self):
         self.default_servers = ['ecdsa.org','electrum.novit.ro']  # list of default servers
         self.host = random.choice( self.default_servers )         # random choice when the wallet is created
-        self.servers = []                                         # actual list from IRC
+        self.servers = self.default_servers                       # actual list from IRC
         self.rtime = 0
         self.blocks = 0 
         self.message = ''
@@ -197,4 +197,6 @@ class Interface:
 
     def start(self, wallet):
         thread.start_new_thread(self.update_wallet_thread, (wallet,))
+
+    def get_servers(self):
         thread.start_new_thread(self.update_servers_thread, ())
diff --git a/client/version.py b/client/version.py
@@ -1,2 +1,2 @@
-ELECTRUM_VERSION = "0.39"
+ELECTRUM_VERSION = "0.39b"
 SEED_VERSION = 4  # bump this everytime the seed generation is modified