fix

1 files changed, 10 insertions, 0 deletions

diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index cf0d1ee..810c889 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1237,128 +1237,138 @@ void KStandardDirs::addKDEDefaults()
 	if (!kdedir.isEmpty())
         {
            kdedir = KShell::tildeExpand(kdedir);
 	   kdedirList.append(kdedir);
         }
     }
 //US    kdedirList.append(KDEDIR);
 //US for embedded, add qtopia dir as kdedir
 
 #ifndef DESKTOP_VERSION
     QString tmp = readEnvPath("QPEDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
     tmp = readEnvPath("QTDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
     tmp = readEnvPath("OPIEDIR");
     if (!tmp.isEmpty())
       kdedirList.append(tmp);
 
 #endif
 
 #ifdef __KDE_EXECPREFIX
     QString execPrefix(__KDE_EXECPREFIX);
     if (execPrefix!="NONE")
        kdedirList.append(execPrefix);
 #endif
 
     QString localKdeDir;
 
 //US    if (getuid())
     if (true)
     {
        localKdeDir = readEnvPath("MICROKDEHOME");
        if (!localKdeDir.isEmpty())
        {
 #ifdef _WIN32_
           if (localKdeDir.at(localKdeDir.length()-1) != '\\')
              localKdeDir += '\\';
 #else
           if (localKdeDir.at(localKdeDir.length()-1) != '/')
              localKdeDir += '/';
 #endif
 	  //QMessageBox::information( 0,"localKdeDir",localKdeDir, 1 );
        }
        else
        {
            QString confFile;
 #ifdef DESKTOP_VERSION           
            confFile = qApp->applicationDirPath ()+ "/.microkdehome" ;
            QFileInfo fi ( confFile );
            if ( !fi.exists() )
                 confFile = QDir::homeDirPath() + "/.microkdehome";
            else
                qDebug("Loading path info from " +  confFile );
 
 #else
            confFile = QDir::homeDirPath() + "/.microkdehome";
 #endif
            KConfig cfg (   confFile );
            cfg.setGroup("Global");
            localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" );
+#ifdef DESKTOP_VERSION           
+           if ( localKdeDir.startsWith( "LOCAL:" ) ) {
+#ifdef _WIN32_
+               localKdeDir = qApp->applicationDirPath () + "\\"+ localKdeDir.mid( 6 );
+#else
+               localKdeDir = qApp->applicationDirPath () + "/"+ localKdeDir.mid( 6 );
+#endif
+               qDebug("Using local conf dir %s ",localKdeDir.latin1() );
+           }
+#endif
        }
     }
     else
     {
        // We treat root different to prevent root messing up the
        // file permissions in the users home directory.
        localKdeDir = readEnvPath("MICROKDEROOTHOME");
        if (!localKdeDir.isEmpty())
        {
           if (localKdeDir.at(localKdeDir.length()-1) != '/')
              localKdeDir += '/';
        }
        else
        {
 //US          struct passwd *pw = getpwuid(0);
 //US          localKdeDir =  QFile::decodeName((pw && pw->pw_dir) ? pw->pw_dir : "/root")  + "/.microkde/";
               qDebug("KStandardDirs::addKDEDefaults: 1 has to be fixed");
        }
 
     }
 
 //US    localKdeDir =  appDir();
 
 //US
 //  qDebug("KStandardDirs::addKDEDefaults: localKdeDir=%s", localKdeDir.latin1());
     if (localKdeDir != "-/")
     {
         localKdeDir = KShell::tildeExpand(localKdeDir);
         addPrefix(localKdeDir);
     }
 
     for (QStringList::ConstIterator it = kdedirList.begin();
 	 it != kdedirList.end(); it++)
     {
         QString dir = KShell::tildeExpand(*it);
 	addPrefix(dir);
     }
     // end KDEDIRS
 
     // begin XDG_CONFIG_XXX
     QStringList xdgdirList;
     QString xdgdirs = readEnvPath("XDG_CONFIG_DIRS");
     if (!xdgdirs.isEmpty())
     {
 	tokenize(xdgdirList, xdgdirs, ":");
     }
     else
     {
 	xdgdirList.clear();
         xdgdirList.append("/etc/xdg");
     }
 
     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
     if (!localXdgDir.isEmpty())
     {
        if (localXdgDir.at(localXdgDir.length()-1) != '/')
           localXdgDir += '/';
     }
     else
     {
 //US       if (getuid())
        if (true)
        {
           localXdgDir =  QDir::homeDirPath() + "/.config/";