| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 | ||||
| -rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 4d859ce..f80c2a6 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -319,10 +319,12 @@ void KSyncManager::slotSyncMenu( int action ) mSpecificResources.clear(); if ( mTargetApp == KAPI ) { + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); mPassWordPiSync = temp->getRemotePwAB(); mActiveSyncPort = temp->getRemotePortAB(); mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { - if ( temp->getIsPiSyncSpec() ) - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); @@ -661,9 +663,12 @@ int KSyncManager::ringSync() mSpecificResources.clear(); if ( mTargetApp == KAPI ) { + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); mPassWordPiSync = temp->getRemotePwAB(); mActiveSyncPort = temp->getRemotePortAB(); mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); @@ -1169,8 +1174,8 @@ void KSyncManager::syncPi() } if ( startLocal+1 < mSpecificResources.count()/2 ) { - mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") ); + mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); QTime timer; timer.start(); - while ( timer.elapsed () < 2000 ) { + while ( timer.elapsed () < 1000 ) { qApp->processEvents(); } diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 6f46d19..2b87298 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp @@ -504,5 +504,4 @@ void KSyncPrefsDialog::chooseFilePWM() { QString fn = QDir::homeDirPath(); - fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this ); if ( fn == "" ) |