Fixes for desktop. Fixed kdehomedir on wintendo

3 files changed, 24 insertions, 9 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f4ac0d6..7bf33d3 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -864,23 +864,23 @@ void MainWindow::initActions()
 }
 void MainWindow::fillSyncMenu()
 {
     if ( syncMenu->count() )
         syncMenu->clear();
     syncMenu->insertItem( i18n("Configure..."), 0 );
     syncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
-        syncMenu->insertItem( i18n("Enable Easy-Pi-Sync"), 2 );
+        syncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
     } else {
-        syncMenu->insertItem( i18n("Disable Easy-Pi-Sync"), 3 );
+        syncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
     }
     syncMenu->insertSeparator();
-    syncMenu->insertItem( i18n("New Easy-Pi-Sync!"), 4 );
-    syncMenu->insertItem( i18n("Quick Easy-Pi-Sync!"), 5 );
+    syncMenu->insertItem( i18n("New Pi-Sync!"), 4 );
+    syncMenu->insertItem( i18n("Quick Pi-Sync!"), 5 );
     syncMenu->insertSeparator();
     syncMenu->insertItem( i18n("Multiple sync"), 1 );
     syncMenu->insertSeparator();
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 3 ) {
@@ -2002,17 +2002,19 @@ void MainWindow::getFile(QSocket* socket)
         QTime ti;
         ti.start();
         while ( ti.elapsed () < 5000  && !socket->canReadLine () ) {
             qDebug("waiting1a %d %d ",ti.elapsed (), socket->bytesAvailable ()  );
             //qApp->processEvents();
             qDebug("waiting1b %d ",ti.elapsed () ); 
             if ( !socket->canReadLine () ) {
                 qDebug("waiting1c %d ",ti.elapsed () ); 
+#ifndef _WIN32_
                 usleep( 100000);
+#endif
             }
                 //socket->waitForMore ( 100 );
         }
         ts <<   socket->readLine ();
 #if 0
 #ifdef DESKTOP_VERSION
         socket->waitForMore ( 5000 );
 #else
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 7231842..eac19ea 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -26,16 +26,17 @@ HEADERS = \
  externalapphandler.h \
  kdateedit.h \
  kdatepicker.h \
  kinputdialog.h \
  kpimprefs.h \
  kpimglobalprefs.h \
  kprefsdialog.h \
  kprefswidget.h \
+ ksyncmanager.h \
  ksyncprofile.h \
  ksyncprefsdialog.h \
  kcmconfigs/kcmkdepimconfig.h \
  kcmconfigs/kdepimconfigwidget.h
 
 SOURCES = \
  categoryeditdialog.cpp \
  categoryeditdialog_base.cpp \
@@ -44,14 +45,15 @@ SOURCES = \
  externalapphandler.cpp \
  kdateedit.cpp \
  kdatepicker.cpp \
  kinputdialog.cpp \
  kpimprefs.cpp \
  kpimglobalprefs.cpp \
  kprefsdialog.cpp \
  kprefswidget.cpp \
+ ksyncmanager.cpp \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.cpp \
  kcmconfigs/kdepimconfigwidget.cpp
 
 
diff --git a/microkde/kdecore/kstandarddirs.cpp b/microkde/kdecore/kstandarddirs.cpp
index 7f2a326..1c3e0ae 100644
--- a/microkde/kdecore/kstandarddirs.cpp
+++ b/microkde/kdecore/kstandarddirs.cpp
@@ -37,16 +37,17 @@
 //US#include <pwd.h>
 
 #include <qregexp.h>
 #include <qasciidict.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
+#include <qmessagebox.h>
 #include <qapplication.h>
 
 #include <qstringlist.h>
 
 #include "kstandarddirs.h"
 #include "kconfig.h"
 #include "kdebug.h"
 //US #include "kinstance.h"
@@ -1199,28 +1200,32 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
         i = pos + 1;
     }
     return true;
 
 }
 
 static QString readEnvPath(const char *env)
 {
-#ifdef _WIN32_
-    return "";
-#else
-   QCString c_path = getenv(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
+   //#endif
+
 }
 
 void KStandardDirs::addKDEDefaults()
 {
+ 
     //qDebug("ERROR: KStandardDirs::addKDEDefaults() called ");
     //return;
     QStringList kdedirList;
 
     // begin KDEDIRS
     QString kdedirs = readEnvPath("MICROKDEDIRS");
     if (!kdedirs.isEmpty())
     {
@@ -1262,18 +1267,24 @@ void KStandardDirs::addKDEDefaults()
     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/";
        }
     }
     else
     {