summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-07 23:26:31 (UTC)
committer zautrix <zautrix>2004-10-07 23:26:31 (UTC)
commit91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5 (patch) (side-by-side diff)
tree8fd8d34625e4e4f28dea34e4cb19612f49eca20d
parent9f1b282aa2a72f3118a89dfebbc3c8132197213a (diff)
downloadkdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.zip
kdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.tar.gz
kdepimpi-91e43b55a0ddf6a6f39f4ed3ae828ddad6ec89a5.tar.bz2
sync fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp1
-rw-r--r--libkdepim/ksyncmanager.cpp4
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
@@ -3721,13 +3721,14 @@ bool CalendarView::syncExternal(KSyncManager* manager, QString resource)
//mSyncManager = manager;
mCurrentSyncDevice = mSyncManager->getCurrentSyncDevice();
mCurrentSyncName = mSyncManager->getCurrentSyncName();
if ( resource == "sharp" )
syncExternal( 0 );
if ( resource == "phone" )
syncExternal( 1 );
// pending setmodified
+ return true;
}
void CalendarView::setSyncManager(KSyncManager* manager)
{
mSyncManager = manager;
}
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 01309d5..b3e266a 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1152,23 +1152,25 @@ void KCommandSocket::readFileFromSocket()
if ( mSocket->state() == QSocket::Idle )
deleteSocket();
}
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();
if ( mSocket->state() == QSocket::Idle )
deleteSocket();
return;
}
}
//qDebug("KCommandSocket::deleteSocket() %d", mRetVal );
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 );
}