| author | zautrix <zautrix> | 2005-11-25 18:35:16 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-11-25 18:35:16 (UTC) |
| commit | 231e6f8215bbc4f7e301965f8f3c650e44586ec9 (patch) (side-by-side diff) | |
| tree | 4c221ec7ac9909b5f0d192c68558739b4dcc1f48 /libkdepim/ksyncmanager.cpp | |
| parent | 279e183c0325cd9565605f60af0215bb9bfdc825 (diff) | |
| download | kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.zip kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.tar.gz kdepimpi-231e6f8215bbc4f7e301965f8f3c650e44586ec9.tar.bz2 | |
sync
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 719d80b..61a9899 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -323,7 +323,7 @@ void KSyncManager::slotSyncMenu( int action ) mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { if ( temp->getIsPiSyncSpec() ) - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() ); + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); mActiveSyncIP = temp->getRemoteIP(); @@ -665,7 +665,7 @@ int KSyncManager::ringSync() mActiveSyncPort = temp->getRemotePortAB(); mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi() ); + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); mActiveSyncIP = temp->getRemoteIP(); @@ -1141,15 +1141,23 @@ void KSyncManager::syncPi() mCurrentResourceLocal = ""; mCurrentResourceRemote = ""; if ( mSpecificResources.count() ) { + int lastSyncRes = mSpecificResources.count()/2; + int ccc = mSpecificResources.count()-1; + while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { + --ccc; + --lastSyncRes; + } int startLocal = 0; int startRemote = mSpecificResources.count()/2; emit multiResourceSyncStart( true ); while ( startLocal < mSpecificResources.count()/2 ) { - if ( startLocal+1 >= mSpecificResources.count()/2 ) + if ( startLocal+1 >= lastSyncRes ) emit multiResourceSyncStart( false ); mPisyncFinished = false; mCurrentResourceLocal = mSpecificResources[ startLocal ]; mCurrentResourceRemote = mSpecificResources[ startRemote ]; + if ( !mCurrentResourceRemote.isEmpty() ) { + qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); commandSocket->readFile( syncFileName() ); @@ -1157,6 +1165,7 @@ void KSyncManager::syncPi() //qDebug("waiting "); qApp->processEvents(); } + } ++startLocal; } } else { |