[tor-commits] [vidalia/master] Remove HttpProxy setting

[chiiph at torproject.org]

commit b4017ad68152a13ea9bdcfb6a35636bf0f6e472a
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Fri Jan 20 19:34:56 2012 -0300

    Remove HttpProxy setting
---
 src/vidalia/config/NetworkPage.cpp     |    1 -
 src/vidalia/config/NetworkSettings.cpp |   12 ------------
 src/vidalia/config/NetworkSettings.h   |    5 ++---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/vidalia/config/NetworkPage.cpp b/src/vidalia/config/NetworkPage.cpp
index b40cbdd..8bfabb3 100644
--- a/src/vidalia/config/NetworkPage.cpp
+++ b/src/vidalia/config/NetworkPage.cpp
@@ -310,7 +310,6 @@ NetworkPage::load()
     proxyType = NetworkSettings::NoProxy;
     ui.chkUseProxy->setChecked(false);
   }
-  ui.cmboProxyType->addItem(tr("HTTP"), NetworkSettings::HttpProxy);
   ui.cmboProxyType->addItem(tr("HTTP / HTTPS"),
                             NetworkSettings::HttpHttpsProxy);
 
diff --git a/src/vidalia/config/NetworkSettings.cpp b/src/vidalia/config/NetworkSettings.cpp
index de818f4..0229442 100644
--- a/src/vidalia/config/NetworkSettings.cpp
+++ b/src/vidalia/config/NetworkSettings.cpp
@@ -26,8 +26,6 @@
 #define SETTING_PROXY_PASSWORD      "ProxyPassword"
 
 /* Tor's proxy options */
-#define SETTING_HTTP_PROXY          "HttpProxy"
-#define SETTING_HTTP_PROXY_AUTH     "HttpProxyAuthenticator"
 #define SETTING_HTTPS_PROXY         "HttpsProxy"
 #define SETTING_HTTPS_PROXY_AUTH    "HttpsProxyAuthenticator"
 #define SETTING_SOCKS4_PROXY        "Socks4Proxy"
@@ -90,9 +88,6 @@ NetworkSettings::apply(QString *errmsg)
     case Socks5Proxy:
       socks5 = addr;
       break;
-    case HttpProxy:
-      http = addr;
-      break;
     case HttpHttpsProxy:
       http = addr;
       https = http;
@@ -107,9 +102,7 @@ NetworkSettings::apply(QString *errmsg)
     conf.insert(SETTING_SOCKS5_PASSWORD, pass);
   }
 
-  conf.insert(SETTING_HTTP_PROXY, http);
   conf.insert(SETTING_HTTPS_PROXY, https);
-  conf.insert(SETTING_HTTP_PROXY_AUTH, auth);
   conf.insert(SETTING_HTTPS_PROXY_AUTH, auth);
 
   if (getUseBridges()) {
@@ -305,9 +298,6 @@ NetworkSettings::proxyTypeToString(ProxyType type)
     case Socks5Proxy:
       ret = "socks5";
       break;
-    case HttpProxy:
-      ret = "http";
-      break;
     case HttpHttpsProxy:
       ret = "httphttps";
       break;
@@ -330,8 +320,6 @@ NetworkSettings::proxyTypeFromString(const QString &type)
     return Socks4Proxy;
   if (str == "socks5")
     return Socks5Proxy;
-  if (str == "http")
-    return HttpProxy;
   if (str == "httphttps")
     return HttpHttpsProxy;
 
diff --git a/src/vidalia/config/NetworkSettings.h b/src/vidalia/config/NetworkSettings.h
index fe555e3..aa5d88a 100644
--- a/src/vidalia/config/NetworkSettings.h
+++ b/src/vidalia/config/NetworkSettings.h
@@ -33,9 +33,8 @@ public:
     NoProxy = -1, /**< Have Tor connect directly to the Internet. */
     Socks4Proxy = 0, /**< Use a SOCKS 4 proxy for OR connections. */
     Socks5Proxy = 1, /**< Use a SOCKS 5 proxy for OR connections. */
-    HttpProxy = 2, /**< Use an HTTP proxy for non-tunneled dir fetches. */
-    HttpHttpsProxy = 3, /**< Use HTTP proxy for both dir and OR connections. */
-    ProxyTypeMax = 3
+    HttpHttpsProxy = 2, /**< Use HTTP proxy for both dir and OR connections. */
+    ProxyTypeMax = 2
   };
 
 public: