summaryrefslogtreecommitdiffabout
path: root/libkdepim
Unidiff
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/ksyncmanager.cpp8
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
@@ -1230,97 +1230,97 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
1230 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); 1230 mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
1231 mPisyncFinished = true; 1231 mPisyncFinished = true;
1232 } else if ( state == KCommandSocket::quiet ){ 1232 } else if ( state == KCommandSocket::quiet ){
1233 qDebug("KSS: quiet "); 1233 qDebug("KSS: quiet ");
1234 mPisyncFinished = true; 1234 mPisyncFinished = true;
1235 } else { 1235 } else {
1236 qDebug("KSS: Error: unknown state: %d ", state); 1236 qDebug("KSS: Error: unknown state: %d ", state);
1237 mPisyncFinished = true; 1237 mPisyncFinished = true;
1238 } 1238 }
1239 1239
1240 delete s; 1240 delete s;
1241} 1241}
1242 1242
1243void KSyncManager::readFileFromSocket() 1243void KSyncManager::readFileFromSocket()
1244{ 1244{
1245 QString fileName = syncFileName(); 1245 QString fileName = syncFileName();
1246 bool syncOK = true; 1246 bool syncOK = true;
1247 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); 1247 mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
1248 if ( ! syncWithFile( fileName , true ) ) { 1248 if ( ! syncWithFile( fileName , true ) ) {
1249 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); 1249 mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
1250 syncOK = false; 1250 syncOK = false;
1251 } 1251 }
1252 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote,mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); 1252 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote,mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() );
1253 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); 1253 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
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
1266KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) 1266KServerSocket:: 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}
1275void KServerSocket::waitForSocketFinish() 1275void 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}
1288void KServerSocket::newConnection ( int socket ) 1288void 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 }
1303 mPendingConnect = 0; 1303 mPendingConnect = 0;
1304 mSocket = new QSocket( this ); 1304 mSocket = new QSocket( this );
1305 connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); 1305 connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
1306 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); 1306 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
1307 mSocket->setSocket( socket ); 1307 mSocket->setSocket( socket );
1308} 1308}
1309 1309
1310void KServerSocket::discardClient() 1310void KServerSocket::discardClient()
1311{ 1311{
1312 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1312 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1313} 1313}
1314void KServerSocket::deleteSocket() 1314void KServerSocket::deleteSocket()
1315{ 1315{
1316 qDebug("KSS::deleteSocket"); 1316 qDebug("KSS::deleteSocket");
1317 if ( mSocket ) { 1317 if ( mSocket ) {
1318 delete mSocket; 1318 delete mSocket;
1319 mSocket = 0; 1319 mSocket = 0;
1320 } 1320 }
1321 if ( mErrorMessage ) 1321 if ( mErrorMessage )
1322 QTimer::singleShot( 10, this , SLOT ( displayErrorMessage())); 1322 QTimer::singleShot( 10, this , SLOT ( displayErrorMessage()));
1323} 1323}
1324void KServerSocket::readClient() 1324void KServerSocket::readClient()
1325{ 1325{
1326 if ( blockRC ) 1326 if ( blockRC )
@@ -1543,121 +1543,121 @@ void KServerSocket::readBackFileFromSocket()
1543 emit file_received( true); 1543 emit file_received( true);
1544 delete mSyncActionDialog; 1544 delete mSyncActionDialog;
1545 mSyncActionDialog = 0; 1545 mSyncActionDialog = 0;
1546 blockRC = false; 1546 blockRC = false;
1547 1547
1548} 1548}
1549 1549
1550KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name ) 1550KCommandSocket::KCommandSocket ( QString remres, QString password, Q_UINT16 port, QString host, QObject * parent, QWidget * cap, const char * name ): QObject( parent, name )
1551{ 1551{
1552 mRemoteResource = remres; 1552 mRemoteResource = remres;
1553 if ( mRemoteResource.isEmpty() ) 1553 if ( mRemoteResource.isEmpty() )
1554 mRemoteResource = "ALL"; 1554 mRemoteResource = "ALL";
1555 else 1555 else
1556 mRemoteResource.replace (QRegExp (" "),"_" ); 1556 mRemoteResource.replace (QRegExp (" "),"_" );
1557 mPassWord = password; 1557 mPassWord = password;
1558 mSocket = 0; 1558 mSocket = 0;
1559 mFirst = false; 1559 mFirst = false;
1560 mFirstLine = true; 1560 mFirstLine = true;
1561 mPort = port; 1561 mPort = port;
1562 mHost = host; 1562 mHost = host;
1563 tlw = cap; 1563 tlw = cap;
1564 mRetVal = quiet; 1564 mRetVal = quiet;
1565 mTimerSocket = new QTimer ( this ); 1565 mTimerSocket = new QTimer ( this );
1566 connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) ); 1566 connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( updateConnectDialog() ) );
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}
1571void KCommandSocket::sendFileRequest() 1571void 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
1587void KCommandSocket::readFile( QString fn ) 1587void 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}
1606void KCommandSocket::updateConnectDialog() 1606void 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}
1625void KCommandSocket::writeFile( QString fileName ) 1625void 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}
1637void KCommandSocket::writeFileToSocket() 1637void KCommandSocket::writeFileToSocket()
1638{ 1638{
1639 mTimerSocket->stop(); 1639 mTimerSocket->stop();
1640 QFile file2( mFileName ); 1640 QFile file2( mFileName );
1641 if (!file2.open( IO_ReadOnly ) ) { 1641 if (!file2.open( IO_ReadOnly ) ) {
1642 mConnectProgress.hide(); 1642 mConnectProgress.hide();
1643 mConnectCount = -1; 1643 mConnectCount = -1;
1644 mRetVal= errorW; 1644 mRetVal= errorW;
1645 mSocket->close(); 1645 mSocket->close();
1646 if ( mSocket->state() == QSocket::Idle ) 1646 if ( mSocket->state() == QSocket::Idle )
1647 QTimer::singleShot( 10, this , SLOT ( deleteSocket())); 1647 QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
1648 return ; 1648 return ;
1649 } 1649 }
1650 mConnectProgress.setTotalSteps ( file2.size() ); 1650 mConnectProgress.setTotalSteps ( file2.size() );
1651 mConnectProgress.show(); 1651 mConnectProgress.show();
1652 int count = 0; 1652 int count = 0;
1653 mConnectProgress.setLabelText( i18n("Sending back synced file...") ); 1653 mConnectProgress.setLabelText( i18n("Sending back synced file...") );
1654 mConnectProgress.setProgress( count ); 1654 mConnectProgress.setProgress( count );
1655 mConnectProgress.blockSignals( true ); 1655 mConnectProgress.blockSignals( true );
1656 QTextStream ts2( &file2 ); 1656 QTextStream ts2( &file2 );
1657 ts2.setEncoding( QTextStream::Latin1 ); 1657 ts2.setEncoding( QTextStream::Latin1 );
1658 QTextStream os2( mSocket ); 1658 QTextStream os2( mSocket );
1659 os2.setEncoding( QTextStream::Latin1 ); 1659 os2.setEncoding( QTextStream::Latin1 );
1660 os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";; 1660 os2 << "PUT " << mPassWord << " " << mRemoteResource << "\r\n\r\n";;
1661 int byteCount = 0; 1661 int byteCount = 0;
1662 int byteMax = file2.size()/53; 1662 int byteMax = file2.size()/53;
1663 while ( ! ts2.atEnd() ) { 1663 while ( ! ts2.atEnd() ) {