data dir

2 files changed, 4 insertions, 2 deletions

diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 4c03c15..f3584d7 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1254,65 +1254,67 @@ void KStandardDirs::addKDEDefaults()
 
     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
        {
-          localKdeDir =  QDir::homeDirPath() + "/kdepim/";
+           KConfig cfg (   QDir::homeDirPath() + "/.microkdehome" );
+           cfg.setGroup("Global");
+           localKdeDir = cfg.readEntry( "MICROKDEHOME", QDir::homeDirPath() + "/kdepim/" );
        }
     }
     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();
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index c4e1108..bee864e 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -539,65 +539,65 @@ public:
         /**
          * @return $XDG_DATA_HOME
          * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
          */
         QString localxdgdatadir() const;
 
         /**
          * @return $XDG_CONFIG_HOME
          * See also http://www.freedesktop.org/standards/basedir/draft/basedir-spec/basedir-spec.html
          */
         QString localxdgconfdir() const;
 
         /**
          * Checks for existence and accessability.
          * Faster than creating a QFileInfo first.
          * @param fullPath the path to check
          * @return true if the directory exists
          */
         static bool exists(const QString &fullPath);
 
         /**
          * Expands all symbolic links and resolves references to 
          * '/./', '/../' and extra  '/' characters in @p dirname
          * and returns the canonicalized absolute pathname.
          * The resulting path will have no symbolic link, '/./' 
          * or '/../' components.
          * @since 3.1
          */
         static QString realPath(const QString &dirname);
         
     static void setAppDir( const QString & );
     static QString appDir();
-        
+         
  private:
 
         QStringList prefixes;
 
         // Directory dictionaries
         QDict<QStringList> absolutes;
         QDict<QStringList> relatives;
 
         mutable QDict<QStringList> dircache;
         mutable QDict<QString> savelocations;
 
         // Disallow assignment and copy-construction
         KStandardDirs( const KStandardDirs& );
         KStandardDirs& operator= ( const KStandardDirs& );
 
         bool addedCustoms;
 
         class KStandardDirsPrivate;
         KStandardDirsPrivate *d;
 //US    
     static QString mAppDir;
 
         void checkConfig() const;
         void applyDataRestrictions(const QString &) const;
         //US void createSpecialResource(const char*);
 };
 
 /**
  * \addtogroup locates Locate Functions
  *  @{
  * On The Usage Of 'locate' and 'locateLocal'
  *