author | zautrix <zautrix> | 2005-07-29 21:08:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-29 21:08:59 (UTC) |
commit | 9cbd19485635dc0edacd14403e4c63d6d469bfce (patch) (unidiff) | |
tree | b3d5a580428ac4ed0b0a7b92149438baf8a66846 /korganizer | |
parent | e287df45507793e2e5ad16085a858153f3798941 (diff) | |
download | kdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.zip kdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.tar.gz kdepimpi-9cbd19485635dc0edacd14403e4c63d6d469bfce.tar.bz2 |
fixx
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7ce0251..45775c5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1980,12 +1980,13 @@ void MainWindow::save() | |||
1980 | mView->viewManager()->journalView()->checkModified(); | 1980 | mView->viewManager()->journalView()->checkModified(); |
1981 | if ( !mCalendarModifiedFlag ) { | 1981 | if ( !mCalendarModifiedFlag ) { |
1982 | qDebug("KO: Calendar not modified. Nothing saved."); | 1982 | qDebug("KO: Calendar not modified. Nothing saved."); |
1983 | return; | 1983 | return; |
1984 | } | 1984 | } |
1985 | if ( mSyncManager->blockSave() ) { | 1985 | if ( mSyncManager->blockSave() ) { |
1986 | slotModifiedChanged( true ); | ||
1986 | return; | 1987 | return; |
1987 | } | 1988 | } |
1988 | mSyncManager->setBlockSave(true); | 1989 | mSyncManager->setBlockSave(true); |
1989 | if ( mView->checkAllFileVersions() ) { | 1990 | if ( mView->checkAllFileVersions() ) { |
1990 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ | 1991 | if ( KPimGlobalPrefs::instance()->mBackupEnabled ){ |
1991 | QDate reference ( 2000,1,1); | 1992 | QDate reference ( 2000,1,1); |
@@ -2556,19 +2557,25 @@ QString MainWindow::sentSyncFile() | |||
2556 | return QString( "/tmp/copysynccal.ics" ); | 2557 | return QString( "/tmp/copysynccal.ics" ); |
2557 | #endif | 2558 | #endif |
2558 | } | 2559 | } |
2559 | 2560 | ||
2560 | void MainWindow::syncFileRequest() | 2561 | void MainWindow::syncFileRequest() |
2561 | { | 2562 | { |
2563 | while ( mSyncManager->blockSave() ) { | ||
2564 | qApp->processEvents(); | ||
2565 | } | ||
2566 | mSyncManager->setBlockSave(true); | ||
2567 | |||
2562 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { | 2568 | if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) { |
2563 | mSyncManager->slotSyncMenu( 999 ); | 2569 | mSyncManager->slotSyncMenu( 999 ); |
2564 | } | 2570 | } |
2565 | 2571 | ||
2566 | setCaption(i18n("Saving Data to temp file ..." )); | 2572 | setCaption(i18n("Saving Data to temp file ..." )); |
2567 | mView->saveCalendar( sentSyncFile() ); | 2573 | mView->saveCalendar( sentSyncFile() ); |
2568 | setCaption(i18n("Data saved to temp file!" )); | 2574 | setCaption(i18n("Data saved to temp file!" )); |
2575 | mSyncManager->setBlockSave( false ); | ||
2569 | 2576 | ||
2570 | } | 2577 | } |
2571 | void MainWindow::getFile( bool success ) | 2578 | void MainWindow::getFile( bool success ) |
2572 | { | 2579 | { |
2573 | if ( ! success ) { | 2580 | if ( ! success ) { |
2574 | setCaption( i18n("Error receiving file. Nothing changed!") ); | 2581 | setCaption( i18n("Error receiving file. Nothing changed!") ); |