1 files changed, 46 insertions, 12 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index b3e266a..0faa24d 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -596,37 +596,67 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
                 postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
             mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
             result = system ( postCommand );
             qDebug("Writing back file result: %d ", result);
             if ( result != 0 ) {
                 mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                 return;
             } else {
                 mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) );
             }
         }
     }
     return;
 }
-
+void KSyncManager::edit_pisync_options()
+{
+    QDialog dia( mParent, "dia", true );
+    dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice );
+    QVBoxLayout lay ( &dia );
+    lay.setSpacing( 5 );
+    lay.setMargin( 3 );
+    QLabel lab1 ( i18n("Password for remote access:"), &dia); 
+    lay.addWidget( &lab1 );
+    QLineEdit le1 (&dia );
+    lay.addWidget( &le1 );
+    QLabel lab2 ( i18n("Remote IP address:"), &dia);
+    lay.addWidget( &lab2 );
+    QLineEdit le2 (&dia );
+    lay.addWidget( &le2 );
+    QLabel lab3 ( i18n("Remote port number:"), &dia);
+    lay.addWidget( &lab3 );
+    QLineEdit le3 (&dia );
+    lay.addWidget( &le3 );
+    QPushButton pb ( "OK",  &dia); 
+    lay.addWidget( &pb );
+    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
+    le1.setText( mPassWordPiSync );
+    le2.setText( mActiveSyncIP  );
+    le3.setText( mActiveSyncPort );
+    if ( dia.exec() ) {
+        mPassWordPiSync = le1.text();
+        mActiveSyncPort = le3.text();
+        mActiveSyncIP = le2.text();
+    }
+   
+}
 void KSyncManager::edit_sync_options()
 {
-    //mDialogManager->showSyncOptions();
-    //mSyncAlgoPrefs 
+
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
     QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
     lay.addWidget(&gr);
     QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
     QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
     QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
     QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
     QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
     QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
     //QRadioButton both( i18n("Take both on conflict"), &gr );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
@@ -772,36 +802,37 @@ QString KSyncManager::syncFileName()
         case (KOPI):
             fn = "tempsynccal.ics";
             break;
         case (PWMPI):
             fn = "tempsyncpw.pwm";
             break;
         default:
             break;
         }
 #ifdef _WIN32_
     return  locateLocal( "tmp", fn );
 #else
     return (QString( "/tmp/" )+ fn );
 #endif
 }
 
-
 void KSyncManager::syncPi()
 {
     qApp->processEvents();
+    if ( mAskForPreferences )
+        edit_pisync_options();
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
     mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     qDebug("MainWindow::deleteCommandSocket %d", state);
     
@@ -884,44 +915,44 @@ void KServerSocket::readClient()
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
         return;
     }
     qDebug("KServerSocket readClient()");
     if ( mSocket->canReadLine() ) {
         QString line = mSocket->readLine();
         qDebug("KServerSocket readline: %s ", line.latin1());
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
         if ( tokens[0] == "GET" ) {
             if (  tokens[1] == mPassWord )
                 //emit sendFile( mSocket );
                 send_file();
             else {
-                KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
+                KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit getFile( mSocket );
                 blockRC = true;
                 get_file();
             }
             else {
-                KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
+                KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
@@ -1142,35 +1173,38 @@ void KCommandSocket::readFileFromSocket()
     // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
     QTextStream ts ( &file );
     ts.setEncoding( QTextStream::Latin1 );
     ts << mFileString;
     file.close();  
     mFileString = "";
     mRetVal = successR;
     mSocket->close();
     // if state is not idle, deleteSocket(); is called via 
     //  connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
     if ( mSocket->state() == QSocket::Idle )
         deleteSocket();
 }
 
 void KCommandSocket::deleteSocket()
 {
+    //qDebug("KCommandSocket::deleteSocket() ");
     if ( mTimerSocket->isActive () ) {
         mTimerSocket->stop();
         mRetVal = errorTO;
+        qDebug("Connection to remote host timed out");
         if ( mSocket ) {
             mSocket->close();
-            if ( mSocket->state() == QSocket::Idle )
-                deleteSocket();
-            return;
+            //if ( mSocket->state() == QSocket::Idle )
+            //   deleteSocket();
+            delete mSocket;
+            mSocket = 0;
         }
+        KMessageBox::error( 0, i18n("Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host? "));
+        emit commandFinished( this, mRetVal );
+        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 );
 }