sync fixes

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 );
 }