author | zautrix <zautrix> | 2005-11-25 22:51:38 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-11-25 22:51:38 (UTC) |
commit | 0e18027f386280bf427ef9d0ffec61a5516cebda (patch) (unidiff) | |
tree | 91f93d724d141b9f087e4cef0c1a11e354ee389a /libkdepim | |
parent | b71ee5442df23bb9900d3db6e6244773ee34ef13 (diff) | |
download | kdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.zip kdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.tar.gz kdepimpi-0e18027f386280bf427ef9d0ffec61a5516cebda.tar.bz2 |
sync
-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 | |||
@@ -1270,17 +1270,17 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject | |||
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; |
@@ -1583,17 +1583,17 @@ void KCommandSocket::sendFileRequest() | |||
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 ) |
@@ -1602,22 +1602,22 @@ void KCommandSocket::readFile( QString fn ) | |||
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 | ||