Fixed compiation errors.

diff --git a/src/extensions/service/aextservice.cpp b/src/extensions/service/aextservice.cpp
index 91b8dbb..b12642c 100644 (file)
--- a/src/extensions/service/aextservice.cpp
+++ b/src/extensions/service/aextservice.cpp
@@ -117,15 +117,15 @@ aExtSERVICE::GetRcFileName() const
 QString 
 aExtSERVICE::GetRcValue( QString paramName ) const
 {
-       if ( !paramName || paramName.isNull() ) 
+       if ( paramName.isNull() ) 
        {
-               aLog::print(aLog::MT_ERROR, tr("Empty rc file parameter name. Can't read such parameter from rc file."));
+               aLog::print(aLog::Error, tr("Empty rc file parameter name. Can't read such parameter from rc file."));
                return "";
        }
        QString paramValue = db->cfg.rc.value( paramName );
-       if ( !paramValue || paramValue.isEmpty() ) 
+       if ( paramValue.isEmpty() ) 
        {       
-               aLog::print(aLog::MT_ERROR,tr("rc file parameter '%1' not found or empty.").arg(paramName));
+               aLog::print(aLog::Error,tr("rc file parameter '%1' not found or empty.").arg(paramName));
                return "";
        }
        return paramValue;

diff --git a/src/extensions/service/service.pro b/src/extensions/service/service.pro
index 60ac715..0d2672b 100644 (file)
--- a/src/extensions/service/service.pro
+++ b/src/extensions/service/service.pro
@@ -4,6 +4,7 @@ SOURCES += aextservice.cpp
 HEADERS        += aextservice.h 
 
 include ( ../../ananas.pri )
+include ( ../../lib/lib.pri )
 
 shared {
 win32:DEFINES+= ANANAS_DLL
@@ -15,7 +16,7 @@ TEMPLATE      =lib
 CONFIG += plugin
 
 INCLUDEPATH    += ../../lib 
-LIBS   += -L../../lib -lananas
+LIBS   += -L../../../lib -lananas4
 
 LANGUAGE       = C++
 win32:DESTDIR = ..

diff --git a/src/lib/aextensionfactory.cpp b/src/lib/aextensionfactory.cpp
index e19b803..a36b5dd 100644 (file)
--- a/src/lib/aextensionfactory.cpp
+++ b/src/lib/aextensionfactory.cpp
@@ -59,7 +59,7 @@ AExtensionFactoryPrivate::AExtensionFactoryPrivate()
 #ifdef Q_OS_WIN32
     extensionsDirName = qApp->applicationDirPath()+"/extensions";
 #else
-    extensionsDirName = "/usr/share/ananas4/extensions";
+    extensionsDirName = "/usr/lib/ananas4/extensions";
 #endif
 
     hash.clear();