tsupport for all protocols - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit a6934f6796d6669f699d6dfa7cafc87850d2b707
DIR parent 9c1b688e4f1630892706941e90c33bc6376c88fb
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 5 Oct 2013 11:16:09 +0200
support for all protocols
Diffstat:
M gui/qt/network_dialog.py | 8 ++++----
M lib/interface.py | 2 +-
M lib/network.py | 9 +++++++--
3 files changed, 12 insertions(+), 7 deletions(-)
---
DIR diff --git a/gui/qt/network_dialog.py b/gui/qt/network_dialog.py
t@@ -235,9 +235,9 @@ class NetworkDialog(QDialog):
if not self.exec_():
return
- server = ':'.join([str( self.server_host.text() ),
- str( self.server_port.text() ),
- (protocol_letters[self.server_protocol.currentIndex()]) ])
+ host = str( self.server_host.text() )
+ port = str( self.server_port.text() )
+ protocol = protocol_letters[self.server_protocol.currentIndex()]
if self.proxy_mode.currentText() != 'NONE':
proxy = { 'mode':str(self.proxy_mode.currentText()).lower(),
t@@ -248,5 +248,5 @@ class NetworkDialog(QDialog):
auto_connect = self.autocycle_cb.isChecked()
- self.network.set_parameters(server, proxy, auto_connect)
+ self.network.set_parameters(host, port, protocol, proxy, auto_connect)
return True
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -225,7 +225,7 @@ class Interface(threading.Thread):
def poll(self):
- self.send([])
+ self.send([], None)
def send_http(self, messages, callback):
DIR diff --git a/lib/network.py b/lib/network.py
t@@ -52,7 +52,7 @@ class Network(threading.Thread):
self.default_server = self.config.get('server')
self.callbacks = {}
- self.protocol = 's'
+ self.protocol = self.config.get('protocol','s')
self.irc_servers = [] # returned by interface (list from irc)
self.disconnected_servers = []
self.recent_servers = self.config.get('recent_servers',[]) # successful connections
t@@ -173,13 +173,18 @@ class Network(threading.Thread):
self.interface.connect_event.wait()
- def set_parameters(self, server, proxy, auto_connect):
+ def set_parameters(self, host, port, protocol, proxy, auto_connect):
+
self.config.set_key("proxy", proxy, True)
self.proxy = proxy
+ self.config.set_key("protocol", protocol, True)
+ self.protocol = protocol
+
self.config.set_key('auto_cycle', auto_connect, True)
+ server = ':'.join([ host, port, protocol ])
self.config.set_key("server", server, True)
if auto_connect: