From e3ae03c8a81ba3a0978b06cf3ca8ce2c95474fb8 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 5 Jan 2009 11:20:32 +0000
Subject: [PATCH] - Ok, HTTP proxy code is working now

---
 src/GUI.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/GUI.cpp b/src/GUI.cpp
index c0f27cb01..79b7eea9a 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -1040,10 +1040,10 @@ void GUI::configureSession(bool deleteOptions) {
     QString proxy_str;
     switch(options->getHTTPProxyType()) {
       case HTTP_PW:
-        proxy_str = misc::toQString("http://")+options->getProxyUsername()+":"+options->getProxyPassword()+"@"+options->getProxyIp()+":"+misc::toQString(proxySettings.port);
+        proxy_str = misc::toQString("http://")+options->getHTTPProxyUsername()+":"+options->getHTTPProxyPassword()+"@"+options->getHTTPProxyIp()+":"+misc::toQString(options->getHTTPProxyPort());
         break;
       default:
-        proxy_str = misc::toQString("http://")+options->getProxyIp()+":"+misc::toQString(proxySettings.port);
+        proxy_str = misc::toQString("http://")+options->getHTTPProxyIp()+":"+misc::toQString(options->getHTTPProxyPort());
     }
     // We need this for urllib in search engine plugins
 #ifdef Q_WS_WIN
@@ -1051,6 +1051,7 @@ void GUI::configureSession(bool deleteOptions) {
     snprintf(proxystr, 512, "http_proxy=%s", proxy_str.toUtf8().data());
     putenv(proxystr);
 #else
+    qDebug("HTTP: proxy string: %s", proxy_str.toUtf8().data());
     setenv("http_proxy", proxy_str.toUtf8().data(), 1);
 #endif
   } else {