confwiz: make opening the welcome page options, off by default on windows, on on mac

diff --git a/src/allmydata/gui/confwiz.py b/src/allmydata/gui/confwiz.py
index 7d3eb2cd206e2655a26dc020bc8a8cef1e8aab81..07b4ad160ae8755f25e9ec7c7e94316727addedf 100644 (file)
--- a/src/allmydata/gui/confwiz.py
+++ b/src/allmydata/gui/confwiz.py
@@ -148,18 +148,20 @@ def DisplayTraceback(message):
     wx.MessageBox(u"%s\n (%s)"%(message,''.join(xc)), 'Error')
 
 class ConfWizApp(wx.App):
-    def __init__(self, server):
+    def __init__(self, server, open_welcome_page=False):
         self.server = server
+        self.show_welcome = open_welcome_page
         wx.App.__init__(self, 0)
 
     def get_backend(self):
         return self.server + BACKEND
 
     def open_welcome_page(self):
-        args = {'v':    str(allmydata.__version__),
-                'plat': sys.platform,
-                }
-        webbrowser.open(self.server + WELCOME_PAGE + '?' + urlencode(args))
+        if self.show_welcome:
+            args = {'v':    str(allmydata.__version__),
+                    'plat': sys.platform,
+                    }
+            webbrowser.open(self.server + WELCOME_PAGE + '?' + urlencode(args))
 
     def OnInit(self):
         try:

diff --git a/src/allmydata/gui/macapp.py b/src/allmydata/gui/macapp.py
index 95ad9b7ea03695d25849933db891a1661249f0fa..6a99e37ec8f84716e6122aec8566ff521a840c37 100644 (file)
--- a/src/allmydata/gui/macapp.py
+++ b/src/allmydata/gui/macapp.py
@@ -63,7 +63,7 @@ class App(object):
             f.close()
 
         if self.is_config_incomplete():
-            app = ConfWizApp(DEFAULT_SERVER_URL)
+            app = ConfWizApp(DEFAULT_SERVER_URL, open_welcome_page=True)
             app.MainLoop()
 
         if self.is_config_incomplete():

diff --git a/windows/confwiz.py b/windows/confwiz.py
index d92658ee4203c512cee2c8cbedecbd90363a7f6e..6b0c24737f7d9cf07fe95cafe6517c14b2b59b4f 100644 (file)
--- a/windows/confwiz.py
+++ b/windows/confwiz.py
@@ -2,4 +2,4 @@ import sys
 from allmydata.gui.confwiz import main
 
 if __name__ == '__main__':
-    main(sys.argv)
+    main(sys.argv, open_welcome_page=False)