Use HttpProxy instead of Socks5Proxy.

src/mirall/application.cpp

@@ -485,9 +485,15 @@ void Application::setupProxy()
         QNetworkProxyFactory::setUseSystemConfiguration(true);
         break;
     }
+
     case QNetworkProxy::Socks5Proxy: {
+        proxy = QNetworkProxy::HttpProxy;
+        cfg.setProxyType(proxy);
+        // fall through
+    }
+    case QNetworkProxy::HttpProxy:{
         QNetworkProxy proxy;
-        proxy.setType(QNetworkProxy::Socks5Proxy);
+        proxy.setType(QNetworkProxy::HttpProxy);
         proxy.setHostName(cfg.proxyHostName());
         proxy.setPort(cfg.proxyPort());
         proxy.setUser(cfg.proxyUser());
@@ -791,12 +797,11 @@ void Application::slotConfigure()
 
 void Application::slotConfigureProxy()
 {
-    ProxyDialog* dlg = new ProxyDialog();
-    if (dlg->exec() == QDialog::Accepted)
+    ProxyDialog dlg;
+    if (dlg.exec() == QDialog::Accepted)
     {
         setupProxy();
     }
-    dlg->deleteLater();
 }
 
 void Application::slotSyncStateChange( const QString& alias )

src/mirall/proxydialog.cpp

@@ -39,7 +39,7 @@ Mirall::ProxyDialog::ProxyDialog( QWidget* parent )
         noProxyRadioButton->setChecked(true);
     if (cfgFile.proxyType() == QNetworkProxy::DefaultProxy)
         systemProxyRadioButton->setChecked(true);
-    if (cfgFile.proxyType() == QNetworkProxy::Socks5Proxy)
+    if (cfgFile.proxyType() == QNetworkProxy::HttpProxy)
     {
         manualProxyRadioButton->setChecked(true);
         hostLineEdit->setText(cfgFile.proxyHostName());
@@ -71,12 +71,12 @@ void Mirall::ProxyDialog::saveSettings()
         {
             QString user = userLineEdit->text();
             QString pass = passwordLineEdit->text();
-            cfgFile.setProxyType(QNetworkProxy::Socks5Proxy, hostLineEdit->text(),
+            cfgFile.setProxyType(QNetworkProxy::HttpProxy, hostLineEdit->text(),
                                  portSpinBox->value(), user, pass);
         }
         else
         {
-            cfgFile.setProxyType(QNetworkProxy::Socks5Proxy, hostLineEdit->text(),
+            cfgFile.setProxyType(QNetworkProxy::HttpProxy, hostLineEdit->text(),
                                  portSpinBox->value(), QString::null, QString::null);
         }
     }