| author | zautrix <zautrix> | 2004-10-07 23:26:31 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-07 23:26:31 (UTC) |
| commit | 91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5 (patch) (side-by-side diff) | |
| tree | 8fd8d34625e4e4f28dea34e4cb19612f49eca20d | |
| parent | 9f1b282aa2a72f3118a89dfebbc3c8132197213a (diff) | |
| download | kdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.zip kdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.tar.gz kdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.tar.bz2 | |
sync fixes
| -rw-r--r-- | korganizer/calendarview.cpp | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index b56f1f9..04051a2 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -3726,6 +3726,7 @@ bool CalendarView::syncExternal(KSyncManager* manager, QString resource) if ( resource == "phone" ) syncExternal( 1 ); // pending setmodified + return true; } void CalendarView::setSyncManager(KSyncManager* manager) { diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 01309d5..b3e266a 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1157,7 +1157,6 @@ void KCommandSocket::deleteSocket() { if ( mTimerSocket->isActive () ) { mTimerSocket->stop(); - KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out!\nDid you forgot to enable\nsyncing on remote host? ")); mRetVal = errorTO; if ( mSocket ) { mSocket->close(); @@ -1170,5 +1169,8 @@ void KCommandSocket::deleteSocket() if ( mSocket) delete mSocket; mSocket = 0; + if ( mRetVal == errorTO) + KMessageBox::information( 0, i18n("ERROR:\nConnection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? ")); + emit commandFinished( this, mRetVal ); } |