3 files changed, 9 insertions, 16 deletions

diff --git a/kabc/stdaddressbook.cpp b/kabc/stdaddressbook.cpp
index 144a9dc..075f12f 100644
--- a/kabc/stdaddressbook.cpp
+++ b/kabc/stdaddressbook.cpp
@@ -16,38 +16,25 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
-/*US
-#include <stdlib.h>
-
-#include <kapplication.h>
-#include <kcrash.h>
-#include <ksimpleconfig.h>
-*/
-
-#ifndef DESKTOP_VERSION
-#include <qpe/global.h>
-#else
 #include <qdir.h>
-#endif
-
 #include "resource.h"
 #include <kresources/manager.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"
 
 using namespace KABC;
 
 StdAddressBook *StdAddressBook::mSelf = 0;
@@ -92,25 +79,27 @@ StdAddressBook *StdAddressBook::self()
 
 QString StdAddressBook::setTempAppDir()
 {
     QString appDIR = KStandardDirs::appDir();
 #ifdef DESKTOP_VERSION
     QString appdir = QDir::homeDirPath();
       if ( appdir.right(1) == "\\" ||   appdir.right(1) == "/" )
           appdir += "kaddressbook/";
       else
           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;
 }
 StdAddressBook *StdAddressBook::self( bool onlyFastResources )
 {
  
    if ( !mSelf )
   { 
       QString appdir =StdAddressBook::setTempAppDir();
 #ifdef KAB_EMBEDDED
     mSelf = addressBookDeleter.setObject( new StdAddressBook( onlyFastResources ) );
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 3f6f69d..47b5484 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -31,25 +31,27 @@ int main( int argc, char **argv )
       if (  command == "-help" ){
           printf("KA/E command line commands:\n");
           printf("  no command: Start KA/E in usual way\n");
           printf("  -help: This output\n");  
           printf(" KA/E is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
 
     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 ;
 #ifndef _WIN32_
     fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons16/";
 #else
     fileName   = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\icons16\\";
 #endif
     KGlobal::iconLoader()->setIconPath(fileName);
     QString appdir = QDir::homeDirPath();
     if ( appdir.right(1) == "\\" ||   appdir.right(1) == "/" )
         appdir += "kaddressbook";
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 6843595..a357988 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -48,25 +48,27 @@ int main( int argc, char **argv )
           printf("  -showNextXView: Next X View\n");
           printf(" -new[Y] and -show[X] may be used togehther\n");
           printf(" KO/Pi is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
       KGlobal::setAppName( "korganizer" );
 
      
   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
 
 #ifndef _WIN32_
     fileName  = qApp->applicationDirPath () + "/kdepim/korganizer/";
 #else
     fileName   = qApp->applicationDirPath () + "\\kdepim\\korganizer\\";
 #endif
 
     KGlobal::iconLoader()->setIconPath(fileName);