From dd8f6efd23350b101065ddb64f35920f24010185 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sun, 03 Oct 2004 18:03:18 +0000
Subject: Fixes for desktop. Fixed kdehomedir on wintendo

---
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f4ac0d6..7bf33d3 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -869,13 +869,13 @@ void MainWindow::fillSyncMenu()
     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();
@@ -2007,7 +2007,9 @@ void MainWindow::getFile(QSocket* socket)
             qDebug("waiting1b %d ",ti.elapsed () ); 
             if ( !socket->canReadLine () ) {
                 qDebug("waiting1c %d ",ti.elapsed () ); 
+#ifndef _WIN32_
                 usleep( 100000);
+#endif
             }
                 //socket->waitForMore ( 100 );
         }
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 7231842..eac19ea 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -31,6 +31,7 @@ HEADERS = \
  kpimglobalprefs.h \
  kprefsdialog.h \
  kprefswidget.h \
+ ksyncmanager.h \
  ksyncprofile.h \
  ksyncprefsdialog.h \
  kcmconfigs/kcmkdepimconfig.h \
@@ -49,6 +50,7 @@ SOURCES = \
  kpimglobalprefs.cpp \
  kprefsdialog.cpp \
  kprefswidget.cpp \
+ ksyncmanager.cpp \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.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
@@ -42,6 +42,7 @@
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qstring.h>
+#include <qmessagebox.h>
 #include <qapplication.h>
 
 #include <qstringlist.h>
@@ -1204,18 +1205,22 @@ bool KStandardDirs::makeDir(const QString& dir2, int mode)
 
 static QString readEnvPath(const char *env)
 {
-#ifdef _WIN32_
-    return "";
-#else
-   QCString c_path = getenv(env);
-   if (c_path.isEmpty())
-      return QString::null;
-   return QFile::decodeName(c_path);
-#endif
+  //#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
+
 }
 
 void KStandardDirs::addKDEDefaults()
 {
+ 
     //qDebug("ERROR: KStandardDirs::addKDEDefaults() called ");
     //return;
     QStringList kdedirList;
@@ -1267,8 +1272,14 @@ void KStandardDirs::addKDEDefaults()
        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
        {
--
cgit v0.9.0.2