| author | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
| commit | d41893fb0a49fbb080326a4c1fd98e1a032a182a (patch) (unidiff) | |
| tree | 9b95603ff93801accaa94de4b73d88ea9c5c9386 /kaddressbook | |
| parent | efdd0735bda81dcd82dfb6d6dc0d0c143f249336 (diff) | |
| download | kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.zip kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.tar.gz kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.tar.bz2 | |
merge contact fixes
| -rw-r--r-- | kaddressbook/kabcore.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 205dbc8..ea34be2 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
| @@ -2733,5 +2733,5 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
| 2733 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2733 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
| 2734 | isXML = true; | 2734 | isXML = true; |
| 2735 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2735 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
| 2736 | } else { | 2736 | } else { |
| 2737 | external = !manager->mIsKapiFile; | 2737 | external = !manager->mIsKapiFile; |
| @@ -2788,5 +2788,5 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) | |||
| 2788 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2788 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
| 2789 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2789 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
| 2790 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2790 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false ); |
| 2791 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2791 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
| 2792 | if ( syncOK ) { | 2792 | if ( syncOK ) { |
| @@ -2830,5 +2830,5 @@ bool KABCore::syncPhone() | |||
| 2830 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2830 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
| 2831 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); | 2831 | abLocal.preparePhoneSync( mCurrentSyncDevice, true ); |
| 2832 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2832 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true ); |
| 2833 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2833 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
| 2834 | if ( syncOK ) { | 2834 | if ( syncOK ) { |