BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
molecular 2014-08-17 11:54:32 +02:00
parent d26d3abf5d 854f49fbed
commit 292a569991
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/electrum.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
icons/electrum.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.0 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

2
lib/network.py
View File

@ -378,7 +378,7 @@ class Network(threading.Thread):
i, response = self.queue.get(timeout=0.1)
except Queue.Empty:
if len(self.interfaces) < self.num_server:
if len(self.interfaces) + len(self.pending_servers) < self.num_server:
self.start_random_interface()
if not self.interfaces:
if time.time() - self.disconnected_time > DISCONNECTED_RETRY_INTERVAL:

2
setup.py
View File

@ -52,7 +52,7 @@ data_files += [
])
]
# replace tlslite
# replace tlslite because of https://github.com/trevp/tlslite/issues/15
os.system("pip install http://download.electrum.org/tlslite-0.4.5.tar.gz")
setup(