From: Christian Kamm <mail@ckamm.de>
Date: Tue, 8 Jan 2019 08:14:38 +0000 (+0100)
Subject: vfs: Disable selective sync if vfs support is available
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~341
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbb32edee2832ea390a225ff1c19ad83f294196b;p=nextcloud-desktop.git

vfs: Disable selective sync if vfs support is available
---

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index b58351e06..20f8688f4 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -418,7 +418,7 @@ void AccountSettings::slotCustomContextMenuRequested(const QPoint &pos)
     ac = menu->addAction(tr("Edit Ignored Files"));
     connect(ac, &QAction::triggered, this, &AccountSettings::slotEditCurrentIgnoredFiles);
 
-    if (!_ui->_folderList->isExpanded(index) && !folder->newFilesAreVirtual()) {
+    if (!_ui->_folderList->isExpanded(index) && !folder->supportsVirtualFiles()) {
         ac = menu->addAction(tr("Choose what to sync"));
         ac->setEnabled(folderConnected);
         connect(ac, &QAction::triggered, this, &AccountSettings::doExpand);
diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 04db5adef..ddb5fd7c9 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -370,7 +370,7 @@ int FolderStatusModel::rowCount(const QModelIndex &parent) const
     auto info = infoForIndex(parent);
     if (!info)
         return 0;
-    if (info->_folder && info->_folder->newFilesAreVirtual())
+    if (info->_folder && info->_folder->supportsVirtualFiles())
         return 0;
     if (info->hasLabel())
         return 1;
@@ -527,7 +527,7 @@ bool FolderStatusModel::hasChildren(const QModelIndex &parent) const
     if (!info)
         return false;
 
-    if (info->_folder && info->_folder->newFilesAreVirtual())
+    if (info->_folder && info->_folder->supportsVirtualFiles())
         return false;
 
     if (!info->_fetched)
@@ -555,7 +555,7 @@ bool FolderStatusModel::canFetchMore(const QModelIndex &parent) const
         // Keep showing the error to the user, it will be hidden when the account reconnects
         return false;
     }
-    if (info->_folder && info->_folder->newFilesAreVirtual()) {
+    if (info->_folder && info->_folder->supportsVirtualFiles()) {
         // Selective sync is hidden in that case
         return false;
     }