removed references to Global::applicationFileName because this call creates the appdir

in ~/Applications/ which is not correct for MicroKDE

1 files changed, 3 insertions, 1 deletions

diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 3f6f69d..47b5484 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -11,65 +11,67 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kaddressbookmain.h"
 
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv ); 
   QApplication::setStyle( new QPlatinumStyle ());
 #endif
   
   bool exitHelp = false;
   if ( argc > 1 ) {
       QString command = argv[1];
       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";
     else
         appdir += "/kaddressbook";
     KStandardDirs::setAppDir( QDir::convertSeparators( appdir ));
     //     qDebug(" %s  ",KStandardDirs::appDir().latin1() );
 #endif // desktop
        QDir app_dir;
        if ( !app_dir.exists(KStandardDirs::appDir()) )
            app_dir.mkdir (KStandardDirs::appDir());
 
        KAddressBookMain* m = new KAddressBookMain();
 //US      MainWindow m;
 //US      QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&m, SLOT(recieve(  const QCString&, const QByteArray& )));
 
 #ifndef DESKTOP_VERSION
        a.showMainWidget(m );
        m->showMaximized();
         
 #else
       a.setMainWidget(m );
       m->show();