Disable the folder if it is going to be removed.

See eb7074e9f0 for discussion

ChangeLog

@@ -1,8 +1,20 @@
 ChangeLog
 =========
 
-version 1.5.2 (release 2014-02-26 )
+version 1.5.3 (release 2014-03-10 )
+  * Fix usage of proxies after first sync run (#1502, #1524, #1459, #1521)
+  * Do not wipe the credentials from config for reconnect (#1499, #1503)
+  * Do not erase the full account config if an old version of the client stored
+    the password (related to above)
+  * Fix layout of the network tab (fixes #1491)
+  * Handle authentication requests by a Shibboleth IdP
+  * Shibboleth: If no connection is available, don't open the login window
+  * [Packaging] Debian/Ubuntu: ship sync-exclude.lst
+  * [Packaging] Fix issues with access to gnome keychain in Fedora and RHEL6
+  * [Packaging] Ensure all sub packages get updated
+  * [Packaging] Fix incorrect path in desktop file (RHEL6/CentOS6)
 
+version 1.5.2 (release 2014-02-26 )
   * Fix behavior when attempting to rename Shared folder
   * Fix potential endless sync loops on Mac OS (#1463)
   * Fix potential crash when pausing during update phase (#1442)
@@ -20,9 +32,6 @@ version 1.5.2 (release 2014-02-26 )
   * Shibboleth: Avoid auth on restart by storing cookies in the wallet
   * Fix license headers 
 
-ChangeLog
-=========
-
 version 1.5.1 (release 2014-02-13 )
   * Added an auto updater that updates the client if a
     more recent version was found automatically (Windows, Mac OS X)
@@ -90,7 +99,6 @@ version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required
   * Windows: Fix move file operation
 
 version 1.4.2 (release 2013-10-18 ), csync 0.90.4 required
-
   * Do not show the warning icon in the tray (#944)
   * Fix manual proxy support when switching (#1016)
   * Add folder column to detailed sync protocol (#1037)

VERSION.cmake

@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX rc1) #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX ) #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )

src/CMakeLists.txt

@@ -170,11 +170,11 @@ set(creds_HEADERS
 IF (NOT APPLE)
     INSTALL(
         FILES ${owncloudsync_HEADERS}
-        DESTINATION ${INCLUDE_INSTALL_DIR}/owncloudsync/mirall
+	DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/mirall
     )
     INSTALL(
         FILES ${creds_HEADERS}
-        DESTINATION ${INCLUDE_INSTALL_DIR}/owncloudsync/creds
+	DESTINATION ${INCLUDE_INSTALL_DIR}/${synclib_NAME}/creds
     )
 ENDIF(NOT APPLE)
 

src/mirall/folderman.cpp

@@ -537,14 +537,17 @@ void FolderMan::removeFolder( const QString& alias )
     if( _folderMap.contains( alias )) {
         qDebug() << "Removing " << alias;
         f = _folderMap.take( alias );
-        if(f) {
-            f->wipe();
-        }
     } else {
         qDebug() << "!! Can not remove " << alias << ", not in folderMap.";
     }
 
     if( f ) {
+        f->wipe();
+
+        // can be removed if we are able to delete the folder object.
+        f->setSyncEnabled(false);
+
+        // remove the folder configuration
         QFile file( _folderConfigPath + QLatin1Char('/') + f->configFile() );
         if( file.exists() ) {
             qDebug() << "Remove folder config file " << file.fileName();

src/mirall/mirallaccessmanager.cpp

@@ -13,6 +13,7 @@
 
 #include <QNetworkRequest>
 #include <QNetworkProxy>
+#include <QAuthenticator>
 
 #include "mirall/mirallaccessmanager.h"
 #include "mirall/utility.h"
@@ -29,6 +30,8 @@ MirallAccessManager::MirallAccessManager(QObject* parent)
     proxy.setHostName(" ");
     setProxy(proxy);
 #endif
+    QObject::connect(this, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                     this, SLOT(slotProxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
 }
 
 QNetworkReply* MirallAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest& request, QIODevice* outgoingData)
@@ -44,4 +47,15 @@ QNetworkReply* MirallAccessManager::createRequest(QNetworkAccessManager::Operati
     return QNetworkAccessManager::createRequest(op, newRequest, outgoingData);
 }
 
+void MirallAccessManager::slotProxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator)
+{
+    Q_UNUSED(authenticator);
+    qDebug() << Q_FUNC_INFO << proxy.type();
+    // We put in the password here and in ClientProxy in the proxy itself.
+    if (!proxy.user().isEmpty() || !proxy.password().isEmpty()) {
+        authenticator->setUser(proxy.user());
+        authenticator->setPassword(proxy.password());
+    }
+}
+
 } // ns Mirall

src/mirall/mirallaccessmanager.h

@@ -28,6 +28,8 @@ public:
 
 protected:
     QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest& request, QIODevice* outgoingData = 0);
+protected slots:
+    void slotProxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator);
 };
 
 } // ns Mirall

src/mirall/networkjobs.cpp

@@ -139,6 +139,9 @@ void AbstractNetworkJob::slotFinished()
 {
     if( _reply->error() != QNetworkReply::NoError ) {
         qDebug() << Q_FUNC_INFO << _reply->error() << _reply->errorString();
+        if (_reply->error() == QNetworkReply::ProxyAuthenticationRequiredError) {
+            qDebug() << Q_FUNC_INFO << _reply->rawHeader("Proxy-Authenticate");
+        }
         emit networkError(_reply);
     }
     finished();