[Pkg-owncloud-commits] [owncloud-client] 289/498: owncloudGui: Do not reset folders when login in or out.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 992d375e9023a15f069ed964e0db6fae68d662fc
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Jul 9 13:25:27 2015 +0200

    owncloudGui: Do not reset folders when login in or out.
    
    This made no sens. Folders are setup when the account is setup.
    
    Also this had the bad side effect to shut the sync engine too early,
    leaving the SyncEngine::_syncRunning to true, and leading to ASSERT later
    
    Issue #3427
---
 src/gui/folder.cpp      | 2 +-
 src/gui/owncloudgui.cpp | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index f07c6f5..b2cc62f 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -803,7 +803,7 @@ void Folder::startSync(const QStringList &pathList)
     _syncResult.setSyncFileItemVector(SyncFileItemVector());
     emit syncStateChange();
 
-    qDebug() << "*** Start syncing - client version"
+    qDebug() << "*** Start syncing " << alias() << " - client version"
              << qPrintable(Theme::instance()->version());
 
     if (! setIgnoredFiles())
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 7f983c8..7f7b5ad 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -569,10 +569,6 @@ void ownCloudGui::slotDisplayIdle()
 void ownCloudGui::slotLogin()
 {
     auto list = AccountManager::instance()->accounts();
-    if (!list.isEmpty()) {
-        FolderMan::instance()->setupFolders();
-    }
-
     if (auto account = qvariant_cast<AccountStatePtr>(sender()->property(propertyAccountC))) {
         account->setSignedOut(false);
     } else {
@@ -601,9 +597,6 @@ void ownCloudGui::slotLogout()
         // show result
         slotComputeOverallSyncStatus();
     }
-    if (!list.isEmpty()) {
-        FolderMan::instance()->setupFolders();
-    }
 }
 
 void ownCloudGui::slotShowGuiMessage(const QString &title, const QString &message)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git