fix proxy issues: override config with command line option, and use interface.proxy in gui

2012-10-09 15:48:06 +02:00
parent 6bf18d8607
commit fd13d19cb8
3 changed files with 21 additions and 15 deletions
--- a/lib/simple_config.py
+++ b/lib/simple_config.py
@@ -5,8 +5,13 @@ from util import user_dir
 class SimpleConfig:


-    default_options = {"gui": "lite", "proxy": { "mode": "none", "host":"localhost", "port":"8080" },
-    "winpos-qt": [100, 100, 840, 400], "winpos-lite": [4, 25, 351, 149], "history": False }
+    default_options = {
+        "gui": "lite",
+        "proxy": None,
+        "winpos-qt": [100, 100, 840, 400],
+        "winpos-lite": [4, 25, 351, 149],
+        "history": False
+        }
    
    def __init__(self):
        # Find electrum data folder