1 files changed, 6 insertions, 4 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e2f956..10cb2a2 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2111,27 +2111,28 @@ void MainWindow::performQuickQuick()
         connect( mCommandSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteCommandSocket()) );
     }
     QString host = KOPrefs::instance()->mActiveSyncIP;
     mCommandSocket->connectToHost( host, port ); 
     QTextStream os( mCommandSocket );
     os.setEncoding( QTextStream::UnicodeUTF8 );
     os << "GET " << mPassWordPiSync << "\r\n";
     setCaption( i18n("Sending request for remote file ...") );
-    mTimerCommandSocket->start( 15000 );
+    mTimerCommandSocket->start( 10000 );
 
 }
 void MainWindow::deleteCommandSocket()
 {
     if ( !mCommandSocket)
         return;
     if ( mTimerCommandSocket->isActive () ) {
       KMessageBox::information( 0, i18n("ERROR:\nConnection to remote host timed out "));
       mTimerCommandSocket->stop();
     }
+    //KMessageBox::information( 0, i18n("MainWindow::deleteCommandSocket "));
     qDebug("MainWindow::deletemCommandSocket() ");
    delete mCommandSocket;
    mCommandSocket = 0; 
 }
 void MainWindow::deleteCommandSocketFinish()
 {
     if ( ! mCommandSocketFinish)
         return;
@@ -2166,17 +2167,17 @@ void MainWindow::readFileFromSocket()
     bool first = true; 
     while ( mCommandSocket->canReadLine () || first) {
         first = false;
         while ( mCommandSocket->canReadLine () ) {
             ts <<   mCommandSocket->readLine ();
         } 
         QTime ti;
         ti.start();
-        while ( ti.elapsed () < 5000  && !mCommandSocket->canReadLine () ) {
+        while ( ti.elapsed () < 3000  && !mCommandSocket->canReadLine () ) {
             qApp->processEvents();
             qDebug("waiting2 %d ",ti.elapsed () );
             if ( !mCommandSocket->canReadLine () )
                 mCommandSocket->waitForMore ( 100 );
         }
         //mCommandSocket->waitForMore ( 5000 );
     }
     file.close();  
@@ -2220,37 +2221,38 @@ void MainWindow::readFileFromSocket()
     QString host = KOPrefs::instance()->mActiveSyncIP;
     QFile file2( fileName );
     if (!file2.open( IO_ReadOnly ) ) {
         setCaption( i18n("Error: Cannot open temp file for read.") );
         qDebug("error open cal file ");
         return ;
                     
     } 
-    setCaption( i18n("Sending back synced file...") );
     QTextStream ts2( &file2 );
     ts2.setCodec( QTextCodec::codecForName("utf8") );
     QTextStream os2( mCommandSocketFinish );
     os2.setCodec( QTextCodec::codecForName("utf8") );
     //os.setEncoding( QTextStream::UnicodeUTF8 );
     if ( KOPrefs::instance()->mWriteBackFile ) {
+    setCaption( i18n("Sending back synced file...") );
         os2 << "PUT " << mPassWordPiSync << "\r\n";;
         while ( ! ts2.atEnd() ) {
            os2 << ts2.readLine() << "\n";
         }
     } else {
         os2 << "STOP\r\n";
     }
     mCommandSocketFinish->close();
     if ( mCommandSocketFinish->state() == QSocket::Idle )
-        deleteCommandSocketFinish();
+        QTimer::singleShot( 10, this , SLOT ( deleteCommandSocketFinish()));
     file.close();
     qDebug("Syncing succesful! ");
     setCaption( i18n("Pi-Sync succesful!") );
 
+    // KMessageBox::information( 0, i18n(" Pi-Sync succesful! "));
 
 }
 
 void MainWindow::syncLocalFile()
 {
 
     QString fn =KOPrefs::instance()->mLastSyncedLocalFile;