[vidalia-svn] r3299: Backport r3298 to the 0.1.x branch. (in vidalia/branches/vidalia-0.1: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-11-14 21:59:57 -0500 (Fri, 14 Nov 2008)
New Revision: 3299

Modified:
   vidalia/branches/vidalia-0.1/CHANGELOG
   vidalia/branches/vidalia-0.1/src/vidalia/config/networksettings.cpp
Log:
Backport r3298 to the 0.1.x branch.


Modified: vidalia/branches/vidalia-0.1/CHANGELOG
===================================================================
--- vidalia/branches/vidalia-0.1/CHANGELOG	2008-11-15 02:56:38 UTC (rev 3298)
+++ vidalia/branches/vidalia-0.1/CHANGELOG	2008-11-15 02:59:57 UTC (rev 3299)
@@ -1,6 +1,9 @@
 0.1.11  xx-xxx-xxxx
   o Remove support for configuring Tor's User and Group options in the 
     Advanced settings page.
+  o Only set HttpsProxy if both the "I use a proxy..." checkbox and the 
+    "Use this proxy for HTTPS also" checkboxes are checked. Otherwise,
+    unset it. (Ticket #440)
 
 
 0.1.10  02-Nov-2008

Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/networksettings.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/networksettings.cpp	2008-11-15 02:56:38 UTC (rev 3298)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/networksettings.cpp	2008-11-15 02:59:57 UTC (rev 3299)
@@ -61,17 +61,21 @@
   conf.insert(SETTING_REACHABLE_ADDRESSES,
     (getFascistFirewall() ? 
       localValue(SETTING_REACHABLE_ADDRESSES).toStringList().join(",") : ""));
-  
-  conf.insert(SETTING_HTTP_PROXY,
-    (getUseHttpProxy() ? localValue(SETTING_HTTP_PROXY).toString() : ""));
+
+  if (getUseHttpProxy())
+    conf.insert(SETTING_HTTP_PROXY, localValue(SETTING_HTTP_PROXY).toString());
+  else
+    conf.insert(SETTING_HTTP_PROXY,  "");
   conf.insert(SETTING_HTTP_PROXY_AUTH,
               localValue(SETTING_HTTP_PROXY_AUTH).toString());
-  
-  conf.insert(SETTING_HTTPS_PROXY,
-    (getUseHttpsProxy() ? localValue(SETTING_HTTPS_PROXY).toString() : ""));
+
+  if (getUseHttpProxy() && getUseHttpsProxy())
+    conf.insert(SETTING_HTTPS_PROXY, localValue(SETTING_HTTPS_PROXY).toString());
+  else
+    conf.insert(SETTING_HTTPS_PROXY, "");
   conf.insert(SETTING_HTTPS_PROXY_AUTH,
               localValue(SETTING_HTTPS_PROXY_AUTH).toString());
-  
+
   if (getUseBridges()) {
     /* We want to always enable TunnelDirConns and friends when using
      * bridge relays. */
@@ -83,7 +87,7 @@
     conf.insert(SETTING_TUNNEL_DIR_CONNS, "0");
     conf.insert(SETTING_PREFER_TUNNELED_DIR_CONNS, "0");
   }
-  
+
   if (torVersion >= 0x020003) {
     /* Do the bridge stuff only on Tor >= 0.2.0.3-alpha */
     QStringList bridges = localValue(SETTING_BRIDGE_LIST).toStringList();