summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp11
-rw-r--r--libkdepim/ksyncmanager.cpp48
-rw-r--r--libkdepim/ksyncmanager.h2
3 files changed, 50 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e45240a..6128137 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1499,3 +1499,3 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
1499 case SYNC_PREF_ASK: 1499 case SYNC_PREF_ASK:
1500 qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); 1500 //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() );
1501 if ( lastSync > remoteMod && lastSync > localMod) 1501 if ( lastSync > remoteMod && lastSync > localMod)
@@ -1506,3 +1506,3 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
1506 return 2; 1506 return 2;
1507 qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); 1507 //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() );
1508 localIsNew = localMod >= remoteMod; 1508 localIsNew = localMod >= remoteMod;
@@ -1543,4 +1543,6 @@ Event* CalendarView::getLastSyncEvent()
1543 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); 1543 //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
1544 mCalendar->setSyncEventsEnabled();
1544 lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); 1545 lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
1545 if (!lse) { 1546 if (!lse) {
1547 qDebug("KO: New last Syncevent created for local: %s",mCurrentSyncDevice.latin1() );
1546 lse = new Event(); 1548 lse = new Event();
@@ -1557,3 +1559,4 @@ Event* CalendarView::getLastSyncEvent()
1557 mCalendar->addEvent( lse ); 1559 mCalendar->addEvent( lse );
1558 } 1560 } else
1561 qDebug("KO: Last Syncevent on local found");
1559 1562
@@ -1635,3 +1638,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
1635 if ( eventR ) { 1638 if ( eventR ) {
1636 qDebug("last-syncEvent on remote found "); 1639 qDebug("KO: Last-syncEvent on remote found ");
1637 eventRSync = (Event*) eventR->clone(); 1640 eventRSync = (Event*) eventR->clone();
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index e1b15d2..8bf0d27 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -1162,5 +1162,7 @@ void KSyncManager::syncPi()
1162 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); 1162 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() );
1163
1163 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); 1164 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
1164 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); 1165 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
1165 commandSocket->readFile( syncFileName() ); 1166 commandSocket->readFile( syncFileName() );
1167 mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) );
1166 while ( !mPisyncFinished ) { 1168 while ( !mPisyncFinished ) {
@@ -1169,5 +1171,14 @@ void KSyncManager::syncPi()
1169 } 1171 }
1172 if ( startLocal+1 < mSpecificResources.count()/2 ) {
1173 mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") );
1174 QTime timer;
1175 timer.start();
1176 while ( timer.elapsed () < 2000 ) {
1177 qApp->processEvents();
1178 }
1179 }
1170 } 1180 }
1171 ++startRemote; 1181 ++startRemote;
1172 ++startLocal; 1182 ++startLocal;
1183
1173 } 1184 }
@@ -1256,2 +1267,3 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject
1256{ 1267{
1268 mPendingConnect = 0;
1257 mPassWord = pw; 1269 mPassWord = pw;
@@ -1262,3 +1274,15 @@ KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject
1262} 1274}
1263 1275void KServerSocket::waitForSocketFinish()
1276{
1277 if ( mSocket ) {
1278 qDebug("KSS:: waiting for finish operation");
1279 QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
1280 return;
1281 }
1282 mSocket = new QSocket( this );
1283 connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
1284 connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
1285 mSocket->setSocket( mPendingConnect );
1286 mPendingConnect = 0;
1287}
1264void KServerSocket::newConnection ( int socket ) 1288void KServerSocket::newConnection ( int socket )
@@ -1266,3 +1290,10 @@ void KServerSocket::newConnection ( int socket )
1266 // qDebug("KServerSocket:New connection %d ", socket); 1290 // qDebug("KServerSocket:New connection %d ", socket);
1291 if ( mPendingConnect ) {
1292 qDebug("KSS::Error : new Connection");
1293 return;
1294 }
1267 if ( mSocket ) { 1295 if ( mSocket ) {
1296 mPendingConnect = socket;
1297 QTimer::singleShot( 250, this , SLOT ( waitForSocketFinish()));
1298 return;
1268 qDebug("KSS::newConnection Socket deleted! "); 1299 qDebug("KSS::newConnection Socket deleted! ");
@@ -1271,2 +1302,3 @@ void KServerSocket::newConnection ( int socket )
1271 } 1302 }
1303 mPendingConnect = 0;
1272 mSocket = new QSocket( this ); 1304 mSocket = new QSocket( this );
@@ -1545,2 +1577,3 @@ void KCommandSocket::sendFileRequest()
1545 mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") ); 1577 mConnectProgress.setCaption( i18n("Pi-Sync: Connected!") );
1578 mConnectProgress.setLabelText( i18n("Waiting for remote file...") );
1546 mTimerSocket->start( 100, true ); 1579 mTimerSocket->start( 100, true );
@@ -1556,3 +1589,4 @@ void KCommandSocket::readFile( QString fn )
1556 if ( !mSocket ) { 1589 if ( !mSocket ) {
1557 mSocket = new QSocket( this ); 1590 mSocket = new QSocket( this );
1591 qDebug("KCS: read file - new socket");
1558 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) ); 1592 connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
@@ -1569,3 +1603,3 @@ void KCommandSocket::readFile( QString fn )
1569 mSocket->connectToHost( mHost, mPort ); 1603 mSocket->connectToHost( mHost, mPort );
1570 qDebug("KSS: Waiting for connection"); 1604 qDebug("KCS: Waiting for connection");
1571} 1605}
@@ -1575,3 +1609,3 @@ void KCommandSocket::updateConnectDialog()
1575 if ( mConnectCount == mConnectMax ) { 1609 if ( mConnectCount == mConnectMax ) {
1576 //qDebug("MAXX %d", mConnectMax); 1610 qDebug("MAXX %d", mConnectMax);
1577 mConnectProgress.setTotalSteps ( 30 ); 1611 mConnectProgress.setTotalSteps ( 30 );
@@ -1580,3 +1614,3 @@ void KCommandSocket::updateConnectDialog()
1580 } 1614 }
1581 //qDebug("updateConnectDialog() %d", mConnectCount); 1615 qDebug("updateConnectDialog() %d", mConnectCount);
1582 mConnectProgress.raise(); 1616 mConnectProgress.raise();
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 53c611d..604adb8 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -60,2 +60,3 @@ class KServerSocket : public QServerSocket
60 private slots: 60 private slots:
61 void waitForSocketFinish();
61 void discardClient(); 62 void discardClient();
@@ -66,2 +67,3 @@ class KServerSocket : public QServerSocket
66 private : 67 private :
68 int mPendingConnect;
67 QString mResource; 69 QString mResource;