- added the ability to connect to the internet through a proxy

- integrated fomod installer now supports the or-operator for page conditions
- integrated fomod installer now caches condition results to speed up tests

1 files changed, 2 insertions, 21 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 583992d1..b92bb538 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -62,7 +62,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QSplashScreen>
 #include <QDirIterator>
 #include <QDesktopServices>
-#include <QNetworkProxy>
 #include <eh.h>
 #include <windows_error.h>
 #include <boost/scoped_array.hpp>
@@ -181,7 +180,7 @@ void cleanupDir()
     "QtXml4.dll",
     "QtWebKit4.dll",
     "qjpeg4.dll",
-    "dlls/phonon4.dll",
+/*    "dlls/phonon4.dll",
     "dlls/QtCore4.dll",
     "dlls/QtGui4.dll",
     "dlls/QtNetwork4.dll",
@@ -190,7 +189,7 @@ void cleanupDir()
     "dlls/QtWebKit4.dll",
     "dlls/QtDeclarative4.dll",
     "dlls/QtScript4.dll",
-    "dlls/QtSql4.dll"
+    "dlls/QtSql4.dll"*/
   };
 
   static const int NUM_FILES = sizeof(fileNames) / sizeof(QString);
@@ -274,21 +273,6 @@ LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *exceptionPtrs
 }
 
 
-void setupNetworkProxy()
-{
-  QNetworkProxyQuery query(QUrl("http://www.google.com"), QNetworkProxyQuery::UrlRequest);
-  query.setProtocolTag("http");
-
-  QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(query);
-  if ((proxies.size() > 0) && (proxies.at(0).type() != QNetworkProxy::NoProxy)) {
-    qDebug("Using proxy: %s", qPrintable(proxies.at(0).hostName()));
-    QNetworkProxy::setApplicationProxy(proxies[0]);
-  } else {
-    qDebug("Not using proxy");
-  }
-}
-
-
 void registerMetaTypes()
 {
   registerExecutable();
@@ -297,11 +281,8 @@ void registerMetaTypes()
 int main(int argc, char *argv[])
 {
   MOApplication application(argc, argv);
-
   qApp->addLibraryPath(application.applicationDirPath() + "/dlls");
 
-  setupNetworkProxy();
-
   SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
 
   LogBuffer::init(20, QtDebugMsg, application.applicationDirPath() + "/logs/mo_interface.log");