fix set_server. keep compatibility with the gtk interface

spesmilo · Oct 2, 2012 · e7e9e89 · e7e9e89
1 parent 385b515
commit e7e9e89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/gui_qt.py b/lib/gui_qt.py
@@ -1450,7 +1450,11 @@ def do_set_line(x):
 
         try:
             cfg.set_key("proxy", { u'mode':unicode(proxy_mode.currentText()).lower(), u'host':unicode(proxy_host.text()), u'port':unicode(proxy_port.text()) }, True)
-            wallet.set_server(server, cfg.config["proxy"])
+            if cfg.config["proxy"]["mode"] != "none":
+                wallet.set_server(server, cfg.config["proxy"])
+            else:
+                wallet.set_server(server)
+
         except Exception as err:
             QMessageBox.information(None, _('Error'), str(err), _('OK'))
             if parent == None:

diff --git a/lib/wallet.py b/lib/wallet.py
@@ -347,7 +347,7 @@ def pick_random_server(self):
     def is_up_to_date(self):
         return self.interface.responses.empty() and not self.interface.unanswered_requests
 
-    def set_server(self, server, proxy):
+    def set_server(self, server, proxy=None):
         # raise an error if the format isnt correct
         a,b,c = server.split(':')
         b = int(b)