Merge branch 'master' of gitorious.org:electrum/electrum

client/electrum

@@ -167,9 +167,8 @@ if __name__ == '__main__':
 
         addresses = wallet.all_addresses()
         version = wallet.electrum_version
-        address_callback = wallet.retrieve_status_callback
-        interface.start_session(addresses, version, address_callback)
-        interface.update_wallet(wallet)
+        interface.start_session(addresses, version)
+        interface.update_wallet()
         wallet.save()
 
     # check if --from_addr not in wallet (for mktx/payto)

client/interface.py

@@ -105,7 +105,7 @@ class Interface:
                 self.is_up_to_date = True
 
         elif method == 'server.peers':
-            print "Received server list: ", result
+            #print "Received server list: ", result
             self.servers = map( lambda x:x[1], result )
 
         elif method == 'address.subscribe':