uuu

2 files changed, 2 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index fd5e4f9..944ee1e 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,30 +1,32 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.1 ************
 
 KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
+Added an error message dialog if saving of calendar files is not possible.
+Made it impossible to close KO/Pi if saving fails.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
 Formatted name is now set on import, if formatted name is empty.
 
 ********** VERSION 2.2.0 ************
 
 New stable release!
 Fixed some minor usability problems.
 Added writing of next alarm to a file for usage on pdaXrom.
 
 
 *************************************
 
 You can find the complete changelog 
 from version 1.7.7 to  2.2.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ca071b2..26323b1 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2502,97 +2502,96 @@ bool CalendarView::checkFileVersion(QString fn)
     QDateTime dt = finf.lastModified ();
     qDebug("loaded file version %s %s", fn.latin1(), loadedFileVersion.toString().latin1());
     qDebug("file on disk version  %s %s", fn.latin1(),dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
     int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg(KGlobal::formatMessage(fn,0)).arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     if ( e )
         mCalendar->deleteEvent( e );
     return true;
 }
 bool CalendarView::saveCalendars()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 ); 
     mCalendar->setDefaultCalendarEnabledOnly();
     QString saveError;
     if ( !saveCalendar( MainWindow::defaultFileName() ) )
         saveError =  cal->mName +"\n";
     cal = calendars.next();
     while ( cal ) {
         if ( !cal->isReadOnly && !cal->mErrorOnLoad ) {
             mCalendar->setDefaultCalendar( cal->mCalNumber ); 
             mCalendar->setDefaultCalendarEnabledOnly();
             if ( saveCalendar( cal->mFileName ) )
                 cal->mLoadDt = QDateTime::currentDateTime();
             else
                 saveError += cal->mName + "\n";
         }
         cal = calendars.next();
     }
     restoreCalendarSettings();
-
     if ( !saveError.isEmpty() ) {
         saveError = KGlobal::formatMessage( i18n("Calendar(s) not saved:"),0 )+"\n" + saveError;
         KMessageBox::error(this, saveError, i18n("Error saving data"));
         return false;
     }
     return true;
 }
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     
     QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
     mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
         return false;
     }
     if ( filename == MainWindow::defaultFileName() ) {
         setLoadedFileVersion( lfv );
         watchSavedFile();
     }
     return true;
 }
 
 void CalendarView::closeCalendar()
 {
  
     // child windows no longer valid
     clearAllViews();
     emit closingDown();
 
     mCalendar->close();
     setModified(false);
     updateView();
 }
 
 void CalendarView::archiveCalendar()
 {
     mDialogManager->showArchiveDialog();
 }