From 9c8e7f4e43d23c6d014ca4ffe2083ad8cc737753 Mon Sep 17 00:00:00 2001
From: Oscar Blumberg <o.blumberg@robertlan.eu.org>
Date: Thu, 22 Feb 2007 20:15:20 +0000
Subject: Add libkmetadata detection and minor fixes SVN_SILENT

svn path=/trunk/KDE/kdebase/apps/; revision=636328
---
 src/metadataloader.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/metadataloader.cpp')

diff --git a/src/metadataloader.cpp b/src/metadataloader.cpp
index 61c809feb..2269a4374 100644
--- a/src/metadataloader.cpp
+++ b/src/metadataloader.cpp
@@ -18,9 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
+#include <config-kmetadata.h>
+
 #include "metadataloader.h"
 
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
 #include <kmetadata/kmetadata.h>
 #endif
 
@@ -29,7 +31,7 @@
 
 MetadataLoader::MetadataLoader()
 {
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
     if (Nepomuk::KMetaData::ResourceManager::instance()->init()) {
         m_up = false;
         Nepomuk::KMetaData::ResourceManager::instance()->setAutoSync(false);
@@ -37,7 +39,7 @@ MetadataLoader::MetadataLoader()
         m_up = true;
     }
 #else
-    m_up = true;
+    m_up = false;
 #endif
 }
 
@@ -51,7 +53,7 @@ bool MetadataLoader::storageUp() {
 
 QString MetadataLoader::getAnnotation(const KUrl& file)
 {
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
     if(m_up)
         return Nepomuk::KMetaData::File(file.url()).getAnnotation();
     else
@@ -61,7 +63,7 @@ QString MetadataLoader::getAnnotation(const KUrl& file)
 
 void MetadataLoader::setAnnotation(const KUrl& file, const QString& annotation)
 {
-#ifdef HAVE_NEPOMUK
+#ifdef HAVE_KMETADATA
     if(m_up)
         Nepomuk::KMetaData::File(file.url()).setAnnotation(annotation);
 #endif
-- 
cgit v1.3