-rw-r--r-- | libkdepim/ksyncmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 8bf0d27..fa7804e 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1254,49 +1254,49 @@ void KSyncManager::readFileFromSocket() | |||
1254 | if ( mWriteBackFile && syncOK ) { | 1254 | if ( mWriteBackFile && syncOK ) { |
1255 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); | 1255 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); |
1256 | commandSocket->writeFile( fileName ); | 1256 | commandSocket->writeFile( fileName ); |
1257 | } | 1257 | } |
1258 | else { | 1258 | else { |
1259 | commandSocket->sendStop(); | 1259 | commandSocket->sendStop(); |
1260 | if ( syncOK ) | 1260 | if ( syncOK ) |
1261 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1261 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
1262 | mPisyncFinished = true; | 1262 | mPisyncFinished = true; |
1263 | } | 1263 | } |
1264 | } | 1264 | } |
1265 | 1265 | ||
1266 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1266 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1267 | { | 1267 | { |
1268 | mPendingConnect = 0; | 1268 | mPendingConnect = 0; |
1269 | mPassWord = pw; | 1269 | mPassWord = pw; |
1270 | mSocket = 0; | 1270 | mSocket = 0; |
1271 | mSyncActionDialog = 0; | 1271 | mSyncActionDialog = 0; |
1272 | blockRC = false; | 1272 | blockRC = false; |
1273 | mErrorMessage = 0; | 1273 | mErrorMessage = 0; |
1274 | } | 1274 | } |
1275 | void KServerSocket::waitForSocketFinish() | 1275 | void KServerSocket::waitForSocketFinish() |
1276 | { | 1276 | { |
1277 | if ( mSocket ) { | 1277 | if ( mSocket ) { |
1278 | qDebug("KSS:: waiting for finish operation"); | 1278 | //qDebug("KSS:: waiting for finish operation"); |
1279 | QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish())); | 1279 | QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish())); |
1280 | return; | 1280 | return; |
1281 | } | 1281 | } |
1282 | mSocket = new QSocket( this ); | 1282 | mSocket = new QSocket( this ); |
1283 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 1283 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
1284 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 1284 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
1285 | mSocket->setSocket( mPendingConnect ); | 1285 | mSocket->setSocket( mPendingConnect ); |
1286 | mPendingConnect = 0; | 1286 | mPendingConnect = 0; |
1287 | } | 1287 | } |
1288 | void KServerSocket::newConnection ( int socket ) | 1288 | void KServerSocket::newConnection ( int socket ) |
1289 | { | 1289 | { |
1290 | // qDebug("KServerSocket:New connection %d ", socket); | 1290 | // qDebug("KServerSocket:New connection %d ", socket); |
1291 | if ( mPendingConnect ) { | 1291 | if ( mPendingConnect ) { |
1292 | qDebug("KSS::Error : new Connection"); | 1292 | qDebug("KSS::Error : new Connection"); |
1293 | return; | 1293 | return; |
1294 | } | 1294 | } |
1295 | if ( mSocket ) { | 1295 | if ( mSocket ) { |
1296 | mPendingConnect = socket; | 1296 | mPendingConnect = socket; |
1297 | QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish())); | 1297 | QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish())); |
1298 | return; | 1298 | return; |
1299 | qDebug("KSS::newConnection Socket deleted! "); | 1299 | qDebug("KSS::newConnection Socket deleted! "); |
1300 | delete mSocket; | 1300 | delete mSocket; |
1301 | mSocket = 0; | 1301 | mSocket = 0; |
1302 | } | 1302 | } |
@@ -1567,73 +1567,73 @@ KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port | |||
1567 | mConnectProgress.setCaption( i18n("Pi-Sync") ); | 1567 | mConnectProgress.setCaption( i18n("Pi-Sync") ); |
1568 | connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) ); | 1568 | connect( &mConnectProgress, SIGNAL ( cancelled () ), this, SLOT ( deleteSocket() ) ); |
1569 | mConnectCount = -1; | 1569 | mConnectCount = -1; |
1570 | } | 1570 | } |
1571 | void KCommandSocket::sendFileRequest() | 1571 | void KCommandSocket::sendFileRequest() |
1572 | { | 1572 | { |
1573 | if ( tlw ) | 1573 | if ( tlw ) |
1574 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); | 1574 | tlw->setCaption( i18n("Connected! Sending request for remote file ...") ); |
1575 | mConnectProgress.hide(); | 1575 | mConnectProgress.hide(); |
1576 | mConnectCount = 300;mConnectMax = 300; | 1576 | mConnectCount = 300;mConnectMax = 300; |
1577 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); | 1577 | mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); |
1578 | mConnectProgress.setLabelText( i18n("Waiting for remote file...") ); | 1578 | mConnectProgress.setLabelText( i18n("Waiting for remote file...") ); |
1579 | mTimerSocket->start( 100, true ); | 1579 | mTimerSocket->start( 100, true ); |
1580 | QTextStream os( mSocket ); | 1580 | QTextStream os( mSocket ); |
1581 | os.setEncoding( QTextStream::Latin1 ); | 1581 | os.setEncoding( QTextStream::Latin1 ); |
1582 | 1582 | ||
1583 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); | 1583 | QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate ); |
1584 | os << "GET " << mPassWord << curDt << " " << mRemoteResource << "\r\n\r\n"; | 1584 | os << "GET " << mPassWord << curDt << " " << mRemoteResource << "\r\n\r\n"; |
1585 | } | 1585 | } |
1586 | 1586 | ||
1587 | void KCommandSocket::readFile( QString fn ) | 1587 | void KCommandSocket::readFile( QString fn ) |
1588 | { | 1588 | { |
1589 | if ( !mSocket ) { | 1589 | if ( !mSocket ) { |
1590 | mSocket = new QSocket( this ); | 1590 | mSocket = new QSocket( this ); |
1591 | qDebug("KCS: read file - new socket"); | 1591 | //qDebug("KCS: read file - new socket"); |
1592 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); | 1592 | connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); |
1593 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1593 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1594 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); | 1594 | connect( mSocket, SIGNAL(connected ()), this, SLOT(sendFileRequest() )); |
1595 | } | 1595 | } |
1596 | mFileString = ""; | 1596 | mFileString = ""; |
1597 | mFileName = fn; | 1597 | mFileName = fn; |
1598 | mFirst = true; | 1598 | mFirst = true; |
1599 | if ( tlw ) | 1599 | if ( tlw ) |
1600 | tlw->setCaption( i18n("Trying to connect to remote...") ); | 1600 | tlw->setCaption( i18n("Trying to connect to remote...") ); |
1601 | mConnectCount = 30;mConnectMax = 30; | 1601 | mConnectCount = 30;mConnectMax = 30; |
1602 | mTimerSocket->start( 1000, true ); | 1602 | mTimerSocket->start( 1000, true ); |
1603 | mSocket->connectToHost( mHost, mPort ); | 1603 | mSocket->connectToHost( mHost, mPort ); |
1604 | qDebug("KCS: Waiting for connection"); | 1604 | qDebug("KCS: Waiting for connection"); |
1605 | } | 1605 | } |
1606 | void KCommandSocket::updateConnectDialog() | 1606 | void KCommandSocket::updateConnectDialog() |
1607 | { | 1607 | { |
1608 | 1608 | ||
1609 | if ( mConnectCount == mConnectMax ) { | 1609 | if ( mConnectCount == mConnectMax ) { |
1610 | qDebug("MAXX %d", mConnectMax); | 1610 | //qDebug("MAXX %d", mConnectMax); |
1611 | mConnectProgress.setTotalSteps ( 30 ); | 1611 | mConnectProgress.setTotalSteps ( 30 ); |
1612 | mConnectProgress.show(); | 1612 | mConnectProgress.show(); |
1613 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); | 1613 | mConnectProgress.setLabelText( i18n("Trying to connect to remote...") ); |
1614 | } | 1614 | } |
1615 | qDebug("updateConnectDialog() %d", mConnectCount); | 1615 | //qDebug("updateConnectDialog() %d", mConnectCount); |
1616 | mConnectProgress.raise(); | 1616 | mConnectProgress.raise(); |
1617 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); | 1617 | mConnectProgress.setProgress( (mConnectMax - mConnectCount)%30 ); |
1618 | --mConnectCount; | 1618 | --mConnectCount; |
1619 | if ( mConnectCount > 0 ) | 1619 | if ( mConnectCount > 0 ) |
1620 | mTimerSocket->start( 1000, true ); | 1620 | mTimerSocket->start( 1000, true ); |
1621 | else | 1621 | else |
1622 | deleteSocket(); | 1622 | deleteSocket(); |
1623 | 1623 | ||
1624 | } | 1624 | } |
1625 | void KCommandSocket::writeFile( QString fileName ) | 1625 | void KCommandSocket::writeFile( QString fileName ) |
1626 | { | 1626 | { |
1627 | if ( !mSocket ) { | 1627 | if ( !mSocket ) { |
1628 | mSocket = new QSocket( this ); | 1628 | mSocket = new QSocket( this ); |
1629 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); | 1629 | connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) ); |
1630 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); | 1630 | connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) ); |
1631 | } | 1631 | } |
1632 | mFileName = fileName ; | 1632 | mFileName = fileName ; |
1633 | mConnectCount = 30;mConnectMax = 30; | 1633 | mConnectCount = 30;mConnectMax = 30; |
1634 | mTimerSocket->start( 1000, true ); | 1634 | mTimerSocket->start( 1000, true ); |
1635 | mSocket->connectToHost( mHost, mPort ); | 1635 | mSocket->connectToHost( mHost, mPort ); |
1636 | } | 1636 | } |
1637 | void KCommandSocket::writeFileToSocket() | 1637 | void KCommandSocket::writeFileToSocket() |
1638 | { | 1638 | { |
1639 | mTimerSocket->stop(); | 1639 | mTimerSocket->stop(); |