summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/mainwindow.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f4ac0d6..7bf33d3 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -866,19 +866,19 @@ 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");
@@ -2004,13 +2004,15 @@ void MainWindow::getFile(QSocket* socket)
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