| author | zautrix <zautrix> | 2005-02-09 20:56:06 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-02-09 20:56:06 (UTC) |
| commit | ab7725c4517a1f6c145075edcff0bdafe105f0ea (patch) (side-by-side diff) | |
| tree | e1a230bcb5c31ca695bbebc40ff80874f2f13380 /libkdepim | |
| parent | a9eff860d8399a198a9fdc04e09ed369097fc745 (diff) | |
| download | kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.zip kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.tar.gz kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.tar.bz2 | |
fixes
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index c8d0e0d..02e5587 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1089,3 +1089,3 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) } else if ( state == KCommandSocket::successW ) { - mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); + mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); mPisyncFinished = true; @@ -1099,2 +1099,3 @@ void KSyncManager::readFileFromSocket() QString fileName = syncFileName(); + bool syncOK = true; mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); @@ -1102,4 +1103,3 @@ void KSyncManager::readFileFromSocket() mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); - mPisyncFinished = true; - return; + syncOK = false; } @@ -1107,3 +1107,3 @@ void KSyncManager::readFileFromSocket() connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); - if ( mWriteBackFile ) + if ( mWriteBackFile && syncOK ) commandSocket->writeFile( fileName ); @@ -1111,3 +1111,4 @@ void KSyncManager::readFileFromSocket() commandSocket->sendStop(); - mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); + if ( syncOK ) + mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); mPisyncFinished = true; @@ -1226,3 +1227,3 @@ void KServerSocket::send_file() if ( secs > 300 ) { - if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { + if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { qDebug("KSS::Sync cancelled ,cs"); |