fixes

3 files changed, 8 insertions, 2 deletions

diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index d182279..2d97c8c 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -315,25 +315,25 @@ KDateTable::setFontSize(int size)
             maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
         }
     // ----- compare with a real wide number and add some space:
     rect=metrics.boundingRect(QString::fromLatin1("88"));
     maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
 #ifdef DESKTOP_VERSION
     maxCell.setHeight(QMAX(maxCell.height()+8, rect.height()));
 #else
     maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
 #endif
     if ( maxCell.width() * 1000 / maxCell.height()  > 1900 ) {
         maxCell.setHeight(maxCell.width() * 1000 / 1900 );
-        qDebug("setmax ");
+        //qDebug("setmax ");
     }
 }
 
 void
 KDateTable::contentsMousePressEvent(QMouseEvent *e)
 {
     if(e->type()!=QEvent::MouseButtonPress)
         { // the KDatePicker only reacts on mouse press events:
             return;
         }
     if(!isEnabled())
         {
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 810c889..4ab1a68 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -1194,25 +1194,25 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
           {
             qDebug("KStandardDirs::makeDir could not create: %s" , base.latin1());
             return false;
           }
         }
 
         i = pos + 1;
     }
     return true;
 
 }
 
-static QString readEnvPath(const char *env)
+QString readEnvPath(const char *env)
 {
   //#ifdef _WIN32_
   //    return "";
   //#else
   QCString c_path;
   if ( getenv(env) != NULL )
     c_path = QString ( getenv(env) );
   if (c_path.isEmpty())
     return QString::null;
   return QFile::decodeName(c_path);
    //#endif
 
@@ -1297,24 +1297,26 @@ void KStandardDirs::addKDEDefaults()
 #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() );
+               // <stdlib.h>
+               setenv(  "LOCALMICROKDEHOME",  localKdeDir.latin1(), 1 );
            }
 #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) != '/')
diff --git a/microkde/kdecore/kstandarddirs.h b/microkde/kdecore/kstandarddirs.h
index bee864e..901384e 100644
--- a/microkde/kdecore/kstandarddirs.h
+++ b/microkde/kdecore/kstandarddirs.h
@@ -638,24 +638,25 @@ public:
  *    \code
  *    // Code example
  *    myFile = locateLocal("appdata", "groups.lst");
  *    myData =  myReadGroups(myFile);
  *    ...
  *    doSomething(myData);
  *    ...
  *    myFile = locateLocal("appdata", "groups.lst");
  *    myWriteGroups(myFile, myData);
  *    \endcode
  **/
 
+
 /*!
  * \relates KStandardDirs
  * This function is just for convenience. It simply calls
  *instance->dirs()->\link KStandardDirs::findResource() findResource\endlink(type, filename).
  **/
 QString locate( const char *type, const QString& filename /*US , const KInstance* instance = KGlobal::instance()*/ );
 
 /*!
  * \relates KStandardDirs
  * This function is much like locate. However it returns a
  * filename suitable for writing to. No check is made if the
  * specified filename actually exists. Missing directories
@@ -667,15 +668,18 @@ QString locateLocal( const char *type, const QString& filename /*US , const KIns
 
 /*!
  * \relates KStandardDirs
  * This function is much like locate. No check is made if the
  * specified filename actually exists. Missing directories
  * are created if @p createDir is true. If filename is only 
  * a directory, without a specific file, 
  * filename must have a trailing slash.
  *
  **/
 QString locateLocal( const char *type, const QString& filename, bool createDir /*US , const KInstance* instance = KGlobal::instance() */);
 
+QString readEnvPath(const char *env);
+
+
 /*! @} */
 
 #endif // SSK_KSTDDIRS_H