tMerge branch 'master' of gitorious.org:electrum/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 04fd72333b45f143911bfbad61bab3dab8adca1e
DIR parent 40f0af178b6180b0f322acf8ae8e7710e1ba7f27
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 20 Mar 2012 08:29:14 +0300
Merge branch 'master' of gitorious.org:electrum/electrum
Diffstat:
M client/electrum | 5 ++---
M client/interface.py | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
---
DIR diff --git a/client/electrum b/client/electrum
t@@ -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)
DIR diff --git a/client/interface.py b/client/interface.py
t@@ -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':