[Pkg-owncloud-commits] [owncloud-client] 31/219: Selective sync: start a sync when the selective sync settings changes

[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 0fb0f2c204a41570fc05d7641e6337bc4dcb36aa
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Aug 28 16:27:46 2014 +0200

    Selective sync: start a sync when the selective sync settings changes
---
 src/mirall/accountsettings.cpp     | 1 -
 src/mirall/selectivesyncdialog.cpp | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index 8ae4f8f..fc0c56a 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -401,7 +401,6 @@ void AccountSettings::slotSelectiveSync()
             (new SelectiveSyncDialog(AccountManager::instance()->account(), f, this))->open();
         }
     }
-
 }
 
 void AccountSettings::slotDoubleClicked( const QModelIndex& indx )
diff --git a/src/mirall/selectivesyncdialog.cpp b/src/mirall/selectivesyncdialog.cpp
index 2580f4d..c730743 100644
--- a/src/mirall/selectivesyncdialog.cpp
+++ b/src/mirall/selectivesyncdialog.cpp
@@ -288,6 +288,12 @@ void SelectiveSyncDialog::accept()
         QSettings settings(_folder->configFile(), QSettings::IniFormat);
         settings.beginGroup(FolderMan::escapeAlias(_folder->alias()));
         settings.setValue("blackList", blackList);
+
+        FolderMan *folderMan = FolderMan::instance();
+        if (_folder->isBusy()) {
+            _folder->slotTerminateSync();
+        }
+        folderMan->slotScheduleSync(_folder->alias());
     }
     QDialog::accept();
 }

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