-rw-r--r-- | kaddressbook/kabcore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index efcd492..7ec3fca 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2780,65 +2780,66 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | |||
2780 | AddressBook::Iterator it; | 2780 | AddressBook::Iterator it; |
2781 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 2781 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
2782 | if ( (*it).revision().date().year() > 2003 ) { | 2782 | if ( (*it).revision().date().year() > 2003 ) { |
2783 | found = true; | 2783 | found = true; |
2784 | break; | 2784 | break; |
2785 | } | 2785 | } |
2786 | } | 2786 | } |
2787 | external = ! found; | 2787 | external = ! found; |
2788 | } | 2788 | } |
2789 | 2789 | ||
2790 | if ( external ) { | 2790 | if ( external ) { |
2791 | qDebug("Setting vcf mode to external "); | 2791 | qDebug("Setting vcf mode to external "); |
2792 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2792 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2793 | AddressBook::Iterator it; | 2793 | AddressBook::Iterator it; |
2794 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 2794 | for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
2795 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); | 2795 | (*it).setID( mCurrentSyncDevice, (*it).uid() ); |
2796 | (*it).computeCsum( mCurrentSyncDevice ); | 2796 | (*it).computeCsum( mCurrentSyncDevice ); |
2797 | } | 2797 | } |
2798 | } | 2798 | } |
2799 | } | 2799 | } |
2800 | //AddressBook::Iterator it; | 2800 | //AddressBook::Iterator it; |
2801 | //QStringList vcards; | 2801 | //QStringList vcards; |
2802 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { | 2802 | //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) { |
2803 | // qDebug("Name %s ", (*it).familyName().latin1()); | 2803 | // qDebug("Name %s ", (*it).familyName().latin1()); |
2804 | //} | 2804 | //} |
2805 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); | 2805 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); |
2806 | if ( syncOK ) { | 2806 | if ( syncOK ) { |
2807 | if ( syncManager->mWriteBackFile ) | 2807 | if ( syncManager->mWriteBackFile ) |
2808 | { | 2808 | { |
2809 | if ( external ) | 2809 | if ( external ) |
2810 | abLocal.removeSyncAddressees( !isXML); | 2810 | abLocal.removeSyncAddressees( !isXML); |
2811 | qDebug("Saving remote AB "); | 2811 | qDebug("Saving remote AB "); |
2812 | abLocal.saveAB(); | 2812 | if ( ! abLocal.saveAB()) |
2813 | qDebug("Error writing back AB to file "); | ||
2813 | if ( isXML ) { | 2814 | if ( isXML ) { |
2814 | // afterwrite processing | 2815 | // afterwrite processing |
2815 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2816 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2816 | } | 2817 | } |
2817 | } | 2818 | } |
2818 | } | 2819 | } |
2819 | setModified(); | 2820 | setModified(); |
2820 | 2821 | ||
2821 | } | 2822 | } |
2822 | if ( syncOK ) | 2823 | if ( syncOK ) |
2823 | mViewManager->refreshView(); | 2824 | mViewManager->refreshView(); |
2824 | return syncOK; | 2825 | return syncOK; |
2825 | #if 0 | 2826 | #if 0 |
2826 | 2827 | ||
2827 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { | 2828 | if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) { |
2828 | getEventViewerDialog()->setSyncMode( true ); | 2829 | getEventViewerDialog()->setSyncMode( true ); |
2829 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 2830 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
2830 | getEventViewerDialog()->setSyncMode( false ); | 2831 | getEventViewerDialog()->setSyncMode( false ); |
2831 | if ( syncOK ) { | 2832 | if ( syncOK ) { |
2832 | if ( KOPrefs::instance()->mWriteBackFile ) | 2833 | if ( KOPrefs::instance()->mWriteBackFile ) |
2833 | { | 2834 | { |
2834 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); | 2835 | storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) ); |
2835 | storage->save(); | 2836 | storage->save(); |
2836 | } | 2837 | } |
2837 | } | 2838 | } |
2838 | setModified(); | 2839 | setModified(); |
2839 | } | 2840 | } |
2840 | 2841 | ||
2841 | #endif | 2842 | #endif |
2842 | } | 2843 | } |
2843 | 2844 | ||
2844 | 2845 | ||