sync fixes

2 files changed, 15 insertions, 9 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fe7e6d3..b7176a1 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2505,75 +2505,80 @@ KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host,
 
     mRetVal = false;
     mTimerSocket = new QTimer ( this );
     connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
 void KCommandSocket::readFile( QString fn )
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     }
     mFileString = "";
     mFileName = fn;
     mFirst = true;
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os( mSocket );
     os.setEncoding( QTextStream::UnicodeUTF8 );
     os << "GET " << mPassWord << "\r\n";
     mTimerSocket->start( 10000 );
 }
 
 void KCommandSocket::writeFile( QString fileName  )
 {
-    QFile file2( fileName );
-    if (!file2.open( IO_ReadOnly ) ) {
-        mRetVal= false;
-        deleteSocket();
-        return ;
-                    
-    }  
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
+        connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
     }
+    mFileName = fileName ;
     mSocket->connectToHost( mHost, mPort ); 
+}
+void KCommandSocket::writeFileToSocket()
+{
+    QFile file2( mFileName );
+    if (!file2.open( IO_ReadOnly ) ) {
+        mRetVal= false;
+        mSocket->close();
+        if ( mSocket->state() == QSocket::Idle )
+            QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
+        return ;
+    }  
     QTextStream ts2( &file2 );
     ts2.setCodec( QTextCodec::codecForName("utf8") );
     QTextStream os2( mSocket );
     os2.setCodec( QTextCodec::codecForName("utf8") );
     os2 << "PUT " << mPassWord << "\r\n";;
     while ( ! ts2.atEnd() ) {
         os2 << ts2.readLine() << "\n";
     }
     mRetVal= true;
+    file2.close();
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
-    file2.close();
 }
-
 void KCommandSocket::sendStop()
 {
     if ( !mSocket ) {
         mSocket = new QSocket( this );
         connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     }
     mSocket->connectToHost( mHost, mPort ); 
     QTextStream os2( mSocket );
     os2.setCodec( QTextCodec::codecForName("utf8") );
     os2 << "STOP\r\n";
     mRetVal= true;
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
 }
 
 void KCommandSocket::startReadFileFromSocket()
 {
     if ( ! mFirst )
         return;
     mFirst = false;
     mTimerSocket->stop();
     mFileString = "";
     mTime.start();
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index f8b2334..90b3a88 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -54,48 +54,49 @@ private slots:
     QSocket* mSocket; 
     QString mPassWord;
     QString mFileName; 
     QTime piTime;
     QString piFileString;
 };
 
 class KCommandSocket : public QObject
 {
     Q_OBJECT
 
 public:
     KCommandSocket ( QString password, Q_UINT16 port, QString host, QObject * parent=0, const char * name=0 );
     void readFile( QString );
     void writeFile( QString );
     void sendStop();
     
    
 signals:
     void commandFinished( KCommandSocket*, bool );
 private slots:
     void startReadFileFromSocket();
     void readFileFromSocket();
     void deleteSocket();
+    void writeFileToSocket();
  private :
     QSocket* mSocket; 
     QString mPassWord;
     Q_UINT16 mPort;
     QString mHost;
     QString mFileName;
     QTimer* mTimerSocket;
     bool mRetVal;
     QTime mTime;
     QString mFileString;
     bool mFirst;
 };
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");