Merge branch for accessibility

[dolphin.git] / src / search / dolphinsearchinformation.cpp

diff --git a/src/search/dolphinsearchinformation.cpp b/src/search/dolphinsearchinformation.cpp
index 2cba5a1475615bd8f6d6b179e841304a415c14c1..8af951a7b247e8433f5849990c8eee6daa793790 100644 (file)
--- a/src/search/dolphinsearchinformation.cpp
+++ b/src/search/dolphinsearchinformation.cpp
@@ -53,15 +53,14 @@ bool DolphinSearchInformation::isIndexingEnabled() const
 bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
 {
 #ifdef HAVE_NEPOMUK
-    const QString path = url.path();
-
     const KConfig strigiConfig("nepomukstrigirc");
     const QStringList indexedFolders = strigiConfig.group("General").readPathEntry("folders", QStringList());
 
     // Check whether the path is part of an indexed folder
     bool isIndexed = false;
     foreach (const QString& indexedFolder, indexedFolders) {
-        if (path.startsWith(indexedFolder)) {
+        const KUrl indexedPath(indexedFolder);
+        if (indexedPath.isParentOf(url)) {
             isIndexed = true;
             break;
         }
@@ -72,7 +71,8 @@ bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
         // excluded folder is part of the path.
         const QStringList excludedFolders = strigiConfig.group("General").readPathEntry("exclude folders", QStringList());
         foreach (const QString& excludedFolder, excludedFolders) {
-            if (path.startsWith(excludedFolder)) {
+            const KUrl excludedPath(excludedFolder);
+            if (excludedPath.isParentOf(url)) {
                 isIndexed = false;
                 break;
             }
@@ -81,7 +81,7 @@ bool DolphinSearchInformation::isPathIndexed(const KUrl& url) const
 
     return isIndexed;
 #else
-    Q_UNUSED(path);
+    Q_UNUSED(url);
     return false;
 #endif
 }
@@ -90,9 +90,9 @@ DolphinSearchInformation::DolphinSearchInformation() :
     m_indexingEnabled(false)
 {
 #ifdef HAVE_NEPOMUK
-    if (Nepomuk::ResourceManager::instance()->init() == 0) {
+    if (Nepomuk::ResourceManager::instance()->initialized()) {
         KConfig config("nepomukserverrc");
-        m_indexingEnabled = config.group("Service-nepomukstrigiservice").readEntry("autostart", false);
+        m_indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
     }
 #endif
 }