From b21b6754c93e5aaa53638a060e26f4efea755d37 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Fri, 02 Jul 2004 15:35:34 +0000 Subject: removed references to Global::applicationFileName because this call creates the appdir in ~/Applications/ which is not correct for MicroKDE --- diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp index 144a9dc..075f12f 100644 --- a/kabc/stdaddressbook.cpp +++ b/kabc/stdaddressbook.cpp @@ -25,20 +25,7 @@ Copyright (c) 2004 Ulf Schenk $Id$ */ -/*US -#include - -#include -#include -#include -*/ - -#ifndef DESKTOP_VERSION -#include -#else #include -#endif - #include "resource.h" #include #include @@ -101,7 +88,9 @@ QString StdAddressBook::setTempAppDir() appdir += "/kaddressbook/"; KStandardDirs::setAppDir( QDir::convertSeparators( appdir )); #else - KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/kaddressbook"; + + KStandardDirs::setAppDir( appdir ); #endif return appDIR; diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 3f6f69d..47b5484 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -40,7 +40,9 @@ int main( int argc, char **argv ) KGlobal::setAppName( "kaddressbook" ); #ifndef DESKTOP_VERSION - KStandardDirs::setAppDir( Global::applicationFileName( "kaddressbook", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); + + KStandardDirs::setAppDir( appdir ); KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/"); #else QString fileName ; diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 6843595..a357988 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -57,7 +57,9 @@ int main( int argc, char **argv ) QString fileName ; #ifndef DESKTOP_VERSION - KStandardDirs::setAppDir( Global::applicationFileName( "korganizer", "" ) ); + QString appdir = QDir::homeDirPath() + "/kdepim/apps/" + KGlobal::getAppName(); + KStandardDirs::setAppDir( appdir ); + fileName = getenv("QPEDIR"); KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/korganizer/"); #else -- cgit v0.9.0.2