| author | zautrix <zautrix> | 2004-10-09 16:58:08 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-09 16:58:08 (UTC) |
| commit | 59ed933d6c43ecb0ddd3dec53cc289ee8aa68482 (patch) (unidiff) | |
| tree | 8b1cbcf9c420e7dffd1e1293bcfa69e8e821f3fa /kaddressbook | |
| parent | b80a099d9432bdc3d4eea778b1813b82b2680ecf (diff) | |
| download | kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.zip kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.tar.gz kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.tar.bz2 | |
fixed sync bug
| -rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 7ec3fca..452f1bc 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
| @@ -2873,13 +2873,13 @@ void KABCore::getFile( bool success ) | |||
| 2873 | { | 2873 | { |
| 2874 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); | 2874 | QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); |
| 2875 | if ( ! success ) { | 2875 | if ( ! success ) { |
| 2876 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2876 | setCaption( i18n("Error receiving file. Nothing changed!") ); |
| 2877 | return; | 2877 | return; |
| 2878 | } | 2878 | } |
| 2879 | mAddressBook->importFromFile( sentSyncFile() ); | 2879 | mAddressBook->importFromFile( sentSyncFile() , false, true ); |
| 2880 | topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 2880 | topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
| 2881 | mViewManager->refreshView(); | 2881 | mViewManager->refreshView(); |
| 2882 | } | 2882 | } |
| 2883 | void KABCore::syncFileRequest() | 2883 | void KABCore::syncFileRequest() |
| 2884 | { | 2884 | { |
| 2885 | mAddressBook->export2File( sentSyncFile() ); | 2885 | mAddressBook->export2File( sentSyncFile() ); |