summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp10
-rw-r--r--libkdepim/libkdepim.pro2
-rw-r--r--microkde/kdecore/kstandarddirs.cpp27
3 files changed, 27 insertions, 12 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f4ac0d6..7bf33d3 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -870,11 +870,11 @@ void MainWindow::fillSyncMenu()
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 );
@@ -2008,5 +2008,7 @@ void MainWindow::getFile(QSocket* socket)
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
@@ -32,4 +32,5 @@ HEADERS = \
kprefsdialog.h \
kprefswidget.h \
+ ksyncmanager.h \
ksyncprofile.h \
ksyncprefsdialog.h \
@@ -50,4 +51,5 @@ SOURCES = \
kprefsdialog.cpp \
kprefswidget.cpp \
+ ksyncmanager.cpp \
ksyncprofile.cpp \
ksyncprefsdialog.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
@@ -43,4 +43,5 @@
#include <qfileinfo.h>
#include <qstring.h>
+#include <qmessagebox.h>
#include <qapplication.h>
@@ -1205,16 +1206,20 @@ 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;
@@ -1268,6 +1273,12 @@ void KStandardDirs::addKDEDefaults()
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