diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2015-06-10 16:57:55 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2015-06-10 16:57:55 +0300 |
commit | 139b28b471afdc5527bfd88d06d3efd260ddccb0 (patch) | |
tree | 8cbeacfdfd5703ac017e7cec996342c743c50b7c /src/gui/selectivesyncdialog.cpp | |
parent | 12f760535dd766eb0d16e6237775438d17fc2b8c (diff) | |
parent | 16786eed54a8dcb0dbac937ea13bc1bb33a59dfc (diff) |
Merge branch 'master' into new-ui
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/gui/folderman.cpp
Diffstat (limited to 'src/gui/selectivesyncdialog.cpp')
-rw-r--r-- | src/gui/selectivesyncdialog.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 9123b3786..320342f00 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -358,7 +358,8 @@ SelectiveSyncDialog::SelectiveSyncDialog(AccountPtr account, Folder* folder, QWi : QDialog(parent, f), _folder(folder) { init(account, tr("Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore")); - _treeView->setFolderInfo(_folder->remotePath(), _folder->alias(), _folder->selectiveSyncBlackList()); + _treeView->setFolderInfo(_folder->remotePath(), _folder->alias(), + _folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList)); // Make sure we don't get crashes if the folder is destroyed while we are still open connect(_folder, SIGNAL(destroyed(QObject*)), this, SLOT(deleteLater())); @@ -396,9 +397,9 @@ void SelectiveSyncDialog::init(const AccountPtr &account, const QString &labelTe void SelectiveSyncDialog::accept() { if (_folder) { - auto oldBlackListSet = _folder->selectiveSyncBlackList().toSet(); + auto oldBlackListSet = _folder->journalDb()->getSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList).toSet(); QStringList blackList = _treeView->createBlackList(); - _folder->setSelectiveSyncBlackList(blackList); + _folder->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, blackList); FolderMan *folderMan = FolderMan::instance(); if (_folder->isBusy()) { |