-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 | |||
@@ -2748,129 +2748,130 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2748 | } | 2748 | } |
2749 | qDebug( mes ); | 2749 | qDebug( mes ); |
2750 | return syncOK; | 2750 | return syncOK; |
2751 | } | 2751 | } |
2752 | 2752 | ||
2753 | 2753 | ||
2754 | //this is a overwritten callbackmethods from the syncinterface | 2754 | //this is a overwritten callbackmethods from the syncinterface |
2755 | bool KABCore::sync(KSyncManager* manager, QString filename, int mode) | 2755 | bool KABCore::sync(KSyncManager* manager, QString filename, int mode) |
2756 | { | 2756 | { |
2757 | 2757 | ||
2758 | //pending prepare addresseeview for output | 2758 | //pending prepare addresseeview for output |
2759 | //pending detect, if remote file has REV field. if not switch to external sync | 2759 | //pending detect, if remote file has REV field. if not switch to external sync |
2760 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 2760 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
2761 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 2761 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
2762 | 2762 | ||
2763 | AddressBook abLocal(filename,"syncContact"); | 2763 | AddressBook abLocal(filename,"syncContact"); |
2764 | bool syncOK = false; | 2764 | bool syncOK = false; |
2765 | if ( abLocal.load() ) { | 2765 | if ( abLocal.load() ) { |
2766 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); | 2766 | qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode ); |
2767 | bool external = false; | 2767 | bool external = false; |
2768 | bool isXML = false; | 2768 | bool isXML = false; |
2769 | if ( filename.right(4) == ".xml") { | 2769 | if ( filename.right(4) == ".xml") { |
2770 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2770 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2771 | isXML = true; | 2771 | isXML = true; |
2772 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2772 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
2773 | } else { | 2773 | } else { |
2774 | Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); | 2774 | Addressee lse = mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice ); |
2775 | if ( ! lse.isEmpty() ) { | 2775 | if ( ! lse.isEmpty() ) { |
2776 | if ( lse.familyName().left(4) == "!E: " ) | 2776 | if ( lse.familyName().left(4) == "!E: " ) |
2777 | external = true; | 2777 | external = true; |
2778 | } else { | 2778 | } else { |
2779 | bool found = false; | 2779 | bool found = false; |
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 | ||
2845 | //this is a overwritten callbackmethods from the syncinterface | 2846 | //this is a overwritten callbackmethods from the syncinterface |
2846 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) | 2847 | bool KABCore::syncExternal(KSyncManager* manager, QString resource) |
2847 | { | 2848 | { |
2848 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); | 2849 | QString mCurrentSyncDevice = manager->getCurrentSyncDevice(); |
2849 | 2850 | ||
2850 | AddressBook abLocal( resource,"syncContact"); | 2851 | AddressBook abLocal( resource,"syncContact"); |
2851 | bool syncOK = false; | 2852 | bool syncOK = false; |
2852 | if ( abLocal.load() ) { | 2853 | if ( abLocal.load() ) { |
2853 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); | 2854 | qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1()); |
2854 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 2855 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
2855 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); | 2856 | abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice ); |
2856 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); | 2857 | syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs ); |
2857 | if ( syncOK ) { | 2858 | if ( syncOK ) { |
2858 | if ( syncManager->mWriteBackFile ) { | 2859 | if ( syncManager->mWriteBackFile ) { |
2859 | abLocal.saveAB(); | 2860 | abLocal.saveAB(); |
2860 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); | 2861 | abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); |
2861 | } | 2862 | } |
2862 | } | 2863 | } |
2863 | setModified(); | 2864 | setModified(); |
2864 | } | 2865 | } |
2865 | if ( syncOK ) | 2866 | if ( syncOK ) |
2866 | mViewManager->refreshView(); | 2867 | mViewManager->refreshView(); |
2867 | return syncOK; | 2868 | return syncOK; |
2868 | 2869 | ||
2869 | } | 2870 | } |
2870 | 2871 | ||
2871 | void KABCore::getFile( bool success ) | 2872 | void KABCore::getFile( bool success ) |
2872 | { | 2873 | { |
2873 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); | 2874 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); |
2874 | if ( ! success ) { | 2875 | if ( ! success ) { |
2875 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2876 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
2876 | return; | 2877 | return; |