-rw-r--r-- | kaddressbook/kabcore.cpp | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f8683e7..c1ead9d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -3023,17 +3023,40 @@ void KABCore::confSync() | |||
3023 | KABPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); | 3023 | KABPrefs::instance()->mSyncProfileNames = sp->getSyncProfileNames(); |
3024 | KABPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); | 3024 | KABPrefs::instance()->mLocalMachineName = sp->getLocalMachineName (); |
3025 | fillSyncMenu(); | 3025 | fillSyncMenu(); |
3026 | } | 3026 | } |
3027 | void KABCore::syncSharp() | 3027 | void KABCore::syncSharp() |
3028 | { | 3028 | { |
3029 | if ( ! syncExternal("sharp") ) | ||
3030 | qDebug("ERROR sync sharp ");; | ||
3031 | } | ||
3032 | bool KABCore::syncExternal(QString resource) | ||
3033 | { | ||
3029 | if ( mModified ) | 3034 | if ( mModified ) |
3030 | save(); | 3035 | save(); |
3031 | qDebug("pending syncSharp() "); | 3036 | if ( KABPrefs::instance()->mAskForPreferences ) |
3032 | //mView->syncSharp(); | 3037 | edit_sync_options(); |
3038 | qDebug("syncSharp() "); | ||
3039 | AddressBook abLocal( resource,"syncContact"); | ||
3040 | bool syncOK = false; | ||
3041 | if ( abLocal.load() ) { | ||
3042 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | ||
3043 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | ||
3044 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | ||
3045 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, KABPrefs::instance()->mSyncAlgoPrefs ); | ||
3046 | if ( syncOK ) { | ||
3047 | if ( KABPrefs::instance()->mWriteBackFile ) { | ||
3048 | abLocal.saveAB(); | ||
3049 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | ||
3050 | } | ||
3051 | } | ||
3033 | setModified(); | 3052 | setModified(); |
3053 | } | ||
3054 | if ( syncOK ) | ||
3055 | mViewManager->refreshView(); | ||
3056 | return syncOK; | ||
3034 | 3057 | ||
3035 | } | 3058 | } |
3036 | void KABCore::syncPhone() | 3059 | void KABCore::syncPhone() |
3037 | { | 3060 | { |
3038 | if ( mModified ) | 3061 | if ( mModified ) |
3039 | save(); | 3062 | save(); |