| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 4d859ce..f80c2a6 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
| @@ -318,12 +318,14 @@ void KSyncManager::slotSyncMenu( int action ) | |||
| 318 | } else if ( temp->getIsPiSync()|| temp->getIsPiSyncSpec()) { | 318 | } else if ( temp->getIsPiSync()|| temp->getIsPiSyncSpec()) { |
| 319 | mSpecificResources.clear(); | 319 | mSpecificResources.clear(); |
| 320 | if ( mTargetApp == KAPI ) { | 320 | if ( mTargetApp == KAPI ) { |
| 321 | if ( temp->getIsPiSyncSpec() ) | ||
| 322 | mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); | ||
| 321 | mPassWordPiSync = temp->getRemotePwAB(); | 323 | mPassWordPiSync = temp->getRemotePwAB(); |
| 322 | mActiveSyncPort = temp->getRemotePortAB(); | 324 | mActiveSyncPort = temp->getRemotePortAB(); |
| 323 | mActiveSyncIP = temp->getRemoteIPAB(); | 325 | mActiveSyncIP = temp->getRemoteIPAB(); |
| 324 | } else if ( mTargetApp == KOPI ) { | 326 | } else if ( mTargetApp == KOPI ) { |
| 325 | if ( temp->getIsPiSyncSpec() ) | 327 | if ( temp->getIsPiSyncSpec() ) |
| 326 | mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); | 328 | mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); |
| 327 | mPassWordPiSync = temp->getRemotePw(); | 329 | mPassWordPiSync = temp->getRemotePw(); |
| 328 | mActiveSyncPort = temp->getRemotePort(); | 330 | mActiveSyncPort = temp->getRemotePort(); |
| 329 | mActiveSyncIP = temp->getRemoteIP(); | 331 | mActiveSyncIP = temp->getRemoteIP(); |
| @@ -660,11 +662,14 @@ int KSyncManager::ringSync() | |||
| 660 | } else if ( temp->getIsPiSync() || temp->getIsPiSyncSpec()) { | 662 | } else if ( temp->getIsPiSync() || temp->getIsPiSyncSpec()) { |
| 661 | mSpecificResources.clear(); | 663 | mSpecificResources.clear(); |
| 662 | if ( mTargetApp == KAPI ) { | 664 | if ( mTargetApp == KAPI ) { |
| 665 | if ( temp->getIsPiSyncSpec() ) | ||
| 666 | mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); | ||
| 663 | mPassWordPiSync = temp->getRemotePwAB(); | 667 | mPassWordPiSync = temp->getRemotePwAB(); |
| 664 | mActiveSyncPort = temp->getRemotePortAB(); | 668 | mActiveSyncPort = temp->getRemotePortAB(); |
| 665 | mActiveSyncIP = temp->getRemoteIPAB(); | 669 | mActiveSyncIP = temp->getRemoteIPAB(); |
| 666 | } else if ( mTargetApp == KOPI ) { | 670 | } else if ( mTargetApp == KOPI ) { |
| 667 | mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); | 671 | if ( temp->getIsPiSyncSpec() ) |
| 672 | mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); | ||
| 668 | mPassWordPiSync = temp->getRemotePw(); | 673 | mPassWordPiSync = temp->getRemotePw(); |
| 669 | mActiveSyncPort = temp->getRemotePort(); | 674 | mActiveSyncPort = temp->getRemotePort(); |
| 670 | mActiveSyncIP = temp->getRemoteIP(); | 675 | mActiveSyncIP = temp->getRemoteIP(); |
| @@ -1168,10 +1173,10 @@ void KSyncManager::syncPi() | |||
| 1168 | qApp->processEvents(); | 1173 | qApp->processEvents(); |
| 1169 | } | 1174 | } |
| 1170 | if ( startLocal+1 < mSpecificResources.count()/2 ) { | 1175 | if ( startLocal+1 < mSpecificResources.count()/2 ) { |
| 1171 | mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") ); | 1176 | mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); |
| 1172 | QTime timer; | 1177 | QTime timer; |
| 1173 | timer.start(); | 1178 | timer.start(); |
| 1174 | while ( timer.elapsed () < 2000 ) { | 1179 | while ( timer.elapsed () < 1000 ) { |
| 1175 | qApp->processEvents(); | 1180 | qApp->processEvents(); |
| 1176 | } | 1181 | } |
| 1177 | } | 1182 | } |