Commit 9dc634bd authored by Stefan Brüns's avatar Stefan Brüns

Remove bogus mount points check when starting baloo on save

Summary:
The check stops baloo if non of the included pathes is *currently*
mounted, i.e. if a device is mounted later baloo is not running and
can not pick up the device.

Depends on D27612

Reviewers: #baloo, ngraham

Reviewed By: #baloo, ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27613
parent cd522998
......@@ -33,7 +33,6 @@
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingCall>
#include <QStorageInfo>
#include <Baloo/IndexerConfig>
#include <baloo/baloosettings.h>
......@@ -87,7 +86,7 @@ void ServerConfigModule::save()
m_previouslyEnabled = m_settings->indexingEnabled();
// Start Baloo
if (m_settings->indexingEnabled() && !allMountPointsExcluded()) {
if (m_settings->indexingEnabled()) {
const QString exe = QStandardPaths::findExecutable(QStringLiteral("baloo_file"));
QProcess::startDetached(exe, QStringList());
}
......@@ -111,16 +110,6 @@ FilteredFolderModel *ServerConfigModule::filteredModel() const
return m_filteredFolderModel;
}
bool ServerConfigModule::allMountPointsExcluded()
{
QStringList mountPoints;
for (const QStorageInfo &si : QStorageInfo::mountedVolumes()) {
mountPoints.append(si.rootPath());
}
return m_settings->excludedFolders().toSet() == mountPoints.toSet();
}
BalooSettings *ServerConfigModule::balooSettings() const
{
return m_settings;
......
......@@ -48,13 +48,6 @@ public Q_SLOTS:
void save() override;
private:
/**
* @brief Check if all mount points are in the excluded from indexing list.
*
* @return True if all mount points are excluded. False otherwise.
*/
bool allMountPointsExcluded();
BalooSettings *m_settings;
FilteredFolderModel *m_filteredFolderModel;
bool m_previouslyEnabled;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment