fixes

6 files changed, 39 insertions, 16 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index aa96210..9118c3d 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -297,3 +297,3 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
                       if ( !setDefaultImage ) {
-                          qDebug("Setting default pixmap ");
+                          //qDebug("Setting default pixmap ");
                           QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index dc5932f..4ab7f02 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -57,3 +57,2 @@ $Id$
 
-
 using namespace KABC;
@@ -100,2 +99,5 @@ ResourceFile::ResourceFile( const QString &fileName ,
 //  qDebug("ResourceFile::ResourceFile : 3 %s, %s", fileName.latin1(), formatName.latin1());
+   
+
+
   init( fileName, formatName );
@@ -120,2 +122,17 @@ void ResourceFile::init( const QString &fileName, const QString &formatName )
 #endif
+
+
+ QString localKdeDir;
+    localKdeDir = readEnvPath("LOCALMICROKDEHOME");
+    if ( ! localKdeDir.isEmpty() ) {
+        qDebug("LOCALMICROKDEHOME is set to: %s",localKdeDir.latin1() );
+
+
+
+
+    }
+    qDebug("RESOURCE: %s ", fileName.latin1());
+
+
+
   setFileName( fileName );
@@ -135,3 +152,3 @@ void ResourceFile::writeConfig( KConfig *config )
 
-  config->writeEntry( "FileName", mFileName );
+  config->writeEntry( "FileName", fileName() );
   config->writeEntry( "FileFormat", mFormatName );
@@ -160,4 +177,4 @@ bool ResourceFile::doOpen()
 {
-  QFile file( mFileName );
-  qDebug("ResourceFile::openfile %s ", mFileName.latin1());
+  QFile file( fileName() );
+  qDebug("ResourceFile::openfile %s ", fileName().latin1());
 
@@ -193,5 +210,5 @@ bool ResourceFile::load()
 
-  QFile file( mFileName );
+  QFile file( fileName() );
   if ( !file.open( IO_ReadOnly ) ) {
-    addressBook()->error( i18n( "Unable to open file '%1'." ).arg( mFileName ) );
+    addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
     return false;
@@ -231,3 +248,3 @@ bool ResourceFile::save( Ticket *ticket )
   QFile info;
-  info.setName( mFileName );
+  info.setName( fileName() );
   bool ok = info.open( IO_WriteOnly );
@@ -244,3 +261,3 @@ bool ResourceFile::save( Ticket *ticket )
   if ( !ok )
-    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( mFileName ) );
+    addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) );
 #ifndef NO_DIRWATCH
@@ -336,3 +353,3 @@ void ResourceFile::setFileName( const QString &fileName )
 #else
-  mFileName = fileName;
+  mFileName2 = fileName;
 #endif
@@ -345,3 +362,3 @@ QString ResourceFile::fileName() const
 {
-  return mFileName;
+  return mFileName2;
 }
@@ -384,3 +401,3 @@ void ResourceFile::fileChanged()
 
-  QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( mFileName ) );
+  QString text( i18n( "File resource '%1'<br> has been changed by third party.<br>Do you want to reload?").arg( fileName() ) );
   if ( readOnly() || KMessageBox::questionYesNo( 0, text ) == KMessageBox::Yes ) {
@@ -400,3 +417,3 @@ void ResourceFile::cleanUp()
 {
-  unlock( mFileName );
+  unlock( fileName() );
 }
diff --git a/kabc/plugins/file/resourcefile.h b/kabc/plugins/file/resourcefile.h
index b4421b2..dd38a9d 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/kabc/plugins/file/resourcefile.h
@@ -149,3 +149,3 @@ protected:
 private:
-  QString mFileName;
+  QString mFileName2;
   QString mFormatName;
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index d182279..2d97c8c 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -326,3 +326,3 @@ KDateTable::setFontSize(int size)
         maxCell.setHeight(maxCell.width() * 1000 / 1900 );
-        qDebug("setmax ");
+        //qDebug("setmax ");
     }
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
@@ -1205,3 +1205,3 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
-static QString readEnvPath(const char *env)
+QString readEnvPath(const char *env)
 {
@@ -1308,2 +1308,4 @@ void KStandardDirs::addKDEDefaults()
                qDebug("Using local conf dir %s ",localKdeDir.latin1() );
+               // <stdlib.h>
+               setenv(  "LOCALMICROKDEHOME",  localKdeDir.latin1(), 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
@@ -649,2 +649,3 @@ public:
 
+
 /*!
@@ -678,2 +679,5 @@ QString locateLocal( const char *type, const QString& filename, bool createDir /
 
+QString readEnvPath(const char *env);
+
+
 /*! @} */