sync fixes

2 files changed, 34 insertions, 14 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 460bbdc..f4ac0d6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -2021,34 +2021,34 @@ void MainWindow::getFile(QSocket* socket)
         bool stop = false;
         QTime ti;
         ti.start();
         while ( ti.elapsed < 5000 && !stop ) {
             qApp->processEvents();
             if ( socket->canReadLine () )
                 stop = true ; 
             else {
                 usleep( 100000    );
                 
             }
         }
 #endif
 #endif
     }
     setCaption( i18n("File received - reloading calendar...") );
-    file.close();  
     socket->close();
+    file.close();  
     mView->watchSavedFile();
     mView->openCalendar( defaultFileName() );
     setCaption( i18n("Easy-Pi-Sync successful!") );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 
 
 } 
 void MainWindow::endConnect()
 {
     setCaption( i18n("No file received - syncing successful") );
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void MainWindow::performQuick()
 {
@@ -2110,114 +2110,117 @@ void MainWindow::performQuickQuick()
     setCaption( i18n("Sending request for remote file ...") );
 
 }
 void MainWindow::readFileFromSocket()
 {
     setCaption( i18n("Receiving remote file ...") );
     qDebug("MainWindow::readFileFromSocket() "); 
 QString fileName;
 #ifdef _WIN32_
     fileName = defaultFileName() +"sync";
 #else
     fileName = "/tmp/kopitempfile.ics";
 #endif
     QFile file( fileName );
     if (!file.open( IO_WriteOnly ) ) {
         setCaption( i18n("Error: Cannot open temp file for write.") );
-        qDebug("Error open calender file for writing: %s",fileName.latin1() );
+        qDebug("Error open temp calender file for writing: %s",fileName.latin1() );
         return ;
     } 
     
     //QTextStream os2( mCommandSocket );
     //os2.setEncoding( QTextStream::UnicodeUTF8 );
 
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") ); 
     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 () ) {
             qApp->processEvents();
             qDebug("waiting2 %d ",ti.elapsed () );
             if ( !mCommandSocket->canReadLine () )
                 mCommandSocket->waitForMore ( 100 );
         }
         //mCommandSocket->waitForMore ( 5000 );
     }
     file.close();  
     mCommandSocket->close();
+    // pending: deleting after signal  SIGNAL(delayedCloseFinished())
     //delete mCommandSocket;
     setCaption( i18n("Remote file saved to temp file.") );
     //mCommandSocket = 0;
     mCurrentSyncProfile = 2 ; // last file
     mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
     mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
     KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
     KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
     KOPrefs::instance()->mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     
     setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
         setCaption( i18n("Syncing failed.") );
         qDebug("Syncing failed ");
         return;
     }
 
     if ( !mCommandSocketFinish ) {
     mCommandSocketFinish  = new QSocket( this );
     }
     mCommandSocketFinish->connectToHost( KOPrefs::instance()->mActiveSyncIP, KOPrefs::instance()->mActiveSyncPort.toUInt() ); 
 
+    // pending connect signals connected () and error to new slots
     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 ) {
         os2 << "PUT\r\n";
         while ( ! ts2.atEnd() ) {
             os2 << ts2.readLine() << "\n";
         }
     } else {
         os2 << "STOP\r\n";
     }
     mCommandSocketFinish->close();
     file.close();
+    // pending: deleting after signal  SIGNAL(delayedCloseFinished())
     //delete ( mCommandSocket);
     //mCommandSocket = 0;
     qDebug("Syncing succesful! ");
     setCaption( i18n("Easy-Pi-Sync succesful!") );
 
 
 }
 
 void MainWindow::syncLocalFile()
 {
 
     QString fn =KOPrefs::instance()->mLastSyncedLocalFile;
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
@@ -2478,62 +2481,77 @@ void MainWindow::syncPhone()
     slotModifiedChanged( true );
 
 }
 
 void MainWindow::printSel( )
 {
     mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 
 void MainWindow::printCal()
 {
     mView->print();//mCp->showDialog();
 }
 
 
 
-KServerSocket:: KServerSocket ( Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ){;};
+KServerSocket:: KServerSocket ( Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
+{
+
+ mSocket = 0;
+};
 
 void KServerSocket::newConnection ( int socket ) 
 {
     qDebug("KServerSocket:New connection %d ", socket); 
-    QSocket* s = new QSocket( this );
-    connect( s, SIGNAL(readyRead()), this, SLOT(readClient()) );
-    connect( s, SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
-    s->setSocket( socket );
+    if ( mSocket ) {
+        qDebug("KServerSocket::newConnection Socket deleted! ");
+        delete mSocket;
+        mSocket = 0;
+    }
+    mSocket = new QSocket( this );
+    connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
+    connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
+    mSocket->setSocket( socket );
 }
 
 void KServerSocket::discardClient()
 {
     qDebug(" KServerSocket::discardClient()");
-    QSocket* socket = (QSocket*)sender();
-    delete socket;
+    if ( mSocket ) {
+        qDebug("delete ");
+        delete mSocket;
+        mSocket = 0;
+    }
     //emit endConnect();
 }
 void KServerSocket::readClient()
 {
+    if ( mSocket == 0 ) {
+        qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
+        return;
+    }
     qDebug("KServerSocket readClient()");
-    QSocket* socket = (QSocket*)sender();
-    if ( socket->canReadLine() ) {
-        QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), socket->readLine() );
+    if ( mSocket->canReadLine() ) {
+        QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), mSocket->readLine() );
         qDebug("KServerSocket socket->canReadLine()");
         if ( tokens[0] == "GET" ) {
-            emit sendFile( socket );
+            emit sendFile( mSocket );
         } 
         if ( tokens[0] == "PUT" ) {
-            emit getFile( socket );
+            emit getFile( mSocket );
         } 
         if ( tokens[0] == "STOP" ) {
             emit endConnect();
         }
     }
 }
 
 
 
 
 
 
 
 
 
 
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 7b4fd27..cc656a3 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -25,32 +25,34 @@ class QPEToolBar;
 class KServerSocket : public QServerSocket
 {
     Q_OBJECT
 
 public:
     KServerSocket ( Q_UINT16 port, int backlog = 0, QObject * parent=0, const char * name=0 );
 
     void newConnection ( int socket ) ;
    
 signals:
     void sendFile(QSocket*); 
     void getFile(QSocket*); 
     void endConnect();
 private slots:
     void discardClient();
     void readClient();
+ private :
+    QSocket* mSocket; 
 };
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
  public  slots: