[vidalia-svn] r2023: Complain if the user checks the "I use a proxy to access the (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-10-12 23:55:08 -0400 (Fri, 12 Oct 2007)
New Revision: 2023

Modified:
   trunk/
   trunk/src/gui/config/networkpage.cpp
Log:
 r2109@lysithea:  edmanm | 2007-10-12 23:55:05 -0400
 Complain if the user checks the "I use a proxy to access the Internet"
 checkbox but doesn't enter any proxy information, or if they check the "My
 firewall only lets me connect to certain ports" checkbox but doesn't enter the
 ports to which their firewall allows them to connect.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2109] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/config/networkpage.cpp
===================================================================
--- trunk/src/gui/config/networkpage.cpp	2007-10-13 03:49:10 UTC (rev 2022)
+++ trunk/src/gui/config/networkpage.cpp	2007-10-13 03:55:08 UTC (rev 2023)
@@ -219,6 +219,21 @@
   QList<quint16> reachablePorts;
   bool ok;
   
+  if (ui.chkUseProxy->isChecked()
+        && (ui.lineHttpProxyAddress->text().isEmpty()
+            || ui.lineHttpProxyPort->text().isEmpty())) {
+    errmsg = tr("You must specify both an IP address or hostname and a "
+                "port number to configure Tor to use a proxy to access "
+                "the Internet.");
+    return false;
+  }
+  if (ui.chkFascistFirewall->isChecked()
+        && ui.lineReachablePorts->text().isEmpty()) {
+    errmsg = tr("You must specify one or more ports to which your "
+                "firewall allows you to connect.");
+    return false;
+  }
+
   /* Save the HTTP/HTTPS proxy settings */
   settings.setUseHttpProxy(ui.chkUseProxy->isChecked());
   settings.setUseHttpsProxy(ui.chkProxyUseHttps->isChecked());