diff --git a/install-64-and-32-bit-linux.sh b/install-64-and-32-bit-linux.sh index 1cf121b..4e620f1 100755 --- a/install-64-and-32-bit-linux.sh +++ b/install-64-and-32-bit-linux.sh @@ -18,4 +18,3 @@ make clean && \ ./configure && \ make check && \ sudo make install - diff --git a/proxyface/autoproxy.hxx b/proxyface/autoproxy.hxx index faf2cc2..c016bf4 100644 --- a/proxyface/autoproxy.hxx +++ b/proxyface/autoproxy.hxx @@ -15,7 +15,7 @@ #include #include #include -#include +// #include #include #endif @@ -77,7 +77,8 @@ namespace proxy { @example test.cxx */ class Interface #ifdef QT_NETWORK_LIB - : public QThread +// : public QThread + : public QObject #endif { #ifdef QT_NETWORK_LIB @@ -91,8 +92,8 @@ namespace proxy { qFatal("connect failed"); if (!connect(&_timeout2, SIGNAL(timeout()), SLOT(timeout()))) qFatal("connect failed"); - if (!connect(this, SIGNAL(finished()), SLOT(threadFinished()))) - qFatal("connect failed"); +// if (!connect(this, SIGNAL(finished()), SLOT(threadFinished()))) +// qFatal("connect failed"); #endif } virtual ~Interface() {} @@ -212,7 +213,10 @@ namespace proxy { " try autoproxy negotiation"; _direct = false; _url = url; - start(); // autoproxy detection in own thread + /****BUGFIX****/ + _proxies = proxies(_url); + threadFinished(); + //start(); // autoproxy detection in own thread } else { qDebug()<<"No proxy at all, giving up - offline?"; proxyError(QNetworkReply::TimeoutError); diff --git a/proxyface/proxy.hxx b/proxyface/proxy.hxx index a57b995..8fd9207 100644 --- a/proxyface/proxy.hxx +++ b/proxyface/proxy.hxx @@ -52,6 +52,7 @@ namespace gui { case 0: try { _url->setEnabled(false); _port->setEnabled(false); + _auto.proxy(_testUrl); type=QNetworkProxy::NoProxy; } catch (...) {} break; case 1: type=QNetworkProxy::HttpProxy; break; @@ -59,7 +60,6 @@ namespace gui { } QNetworkProxy::setApplicationProxy (QNetworkProxy(type, _url->text(), _port->value())); - _auto.proxy(_testUrl); } Q_SIGNALS: