[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dolphin] src/kitemviews: Only perform operations with Baloo if it is enabled
From:       Vishesh Handa <me () vhanda ! in>
Date:       2015-10-10 16:33:41
Message-ID: E1Zkx5Z-0001pz-3S () scm ! kde ! org
[Download RAW message or body]

Git commit f5fd8e5cfb43deb1ccb0fef76e335afbde088965 by Vishesh Handa.
Committed on 10/10/2015 at 16:33.
Pushed by vhanda into branch 'master'.

Only perform operations with Baloo if it is enabled

REVIEW: 125584

M  +1    -1    src/kitemviews/kfileitemmodelrolesupdater.cpp
M  +2    -0    src/kitemviews/kfileitemmodelrolesupdater.h

http://commits.kde.org/dolphin/f5fd8e5cfb43deb1ccb0fef76e335afbde088965

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp \
b/src/kitemviews/kfileitemmodelrolesupdater.cpp index b03fd9c..14e3015 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -278,7 +278,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet<QByteArray>& \
roles)  }
         }
 
-        if (hasBalooRole && !m_balooFileMonitor) {
+        if (hasBalooRole && m_balooConfig.fileIndexingEnabled() && \
!m_balooFileMonitor) {  m_balooFileMonitor = new Baloo::FileMonitor(this);
             connect(m_balooFileMonitor, &Baloo::FileMonitor::fileMetaDataChanged,
                     this, &KFileItemModelRolesUpdater::applyChangedBalooRoles);
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h \
b/src/kitemviews/kfileitemmodelrolesupdater.h index 216b0a5..6e7559f 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -46,6 +46,7 @@ namespace KIO {
     {
         class FileMonitor;
     }
+    #include <Baloo/IndexerConfig>
 #endif
 
 /**
@@ -335,6 +336,7 @@ private:
 
 #ifdef HAVE_BALOO
     Baloo::FileMonitor* m_balooFileMonitor;
+    Baloo::IndexerConfig m_balooConfig;
 #endif
 };
 


[prev in list] [next in list] [prev in thread] [next in thread]