1 files changed, 10 insertions, 2 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index f05ada5..472a978 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1779,117 +1779,125 @@ void MainWindow::saveOnClose()
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
     
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
 #endif
 
     if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
         save();
     mView->writeSettings();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::save()
 {
     if ( !mCalendarModifiedFlag ) {
         qDebug("KO: Calendar not modified. Nothing saved.");
         return;
     }
     if ( mSyncManager->blockSave() )
         return;
     mSyncManager->setBlockSave(true);
-    if ( mView->checkFileVersion( defaultFileName()) ) {
+    if ( mView->checkAllFileVersions() ) {
         if ( KPimGlobalPrefs::instance()->mBackupEnabled ){
             QDate reference ( 2000,1,1);
             int daysTo = reference.daysTo ( QDate::currentDate() );
             if ( daysTo - KPimGlobalPrefs::instance()->mBackupDayCount >= KOPrefs::instance()->mLastBackupDate ) {
                 setCaption(i18n("Creating backup ... please wait ..." ));
                 qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
                 // we need the file path, the backup dir and the number of bups as param
                 QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
                 if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
                     bupDir = KGlobalSettings::backupDataDir();
                 int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
                 if ( retval == 0 ) {
                     qDebug("KO: Backup cancelled. Will try again tomorrow ");
                     // retval == 0 : backup skipped for today, try again tomorrow
                     KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
                 } else if ( retval == 1 ){
                     qDebug("KO: Backup created.");
                     // backup ok
+                    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+                    KopiCalendarFile * cal = calendars.first();
+                    cal = calendars.next();
+                    while ( cal ) {
+                        if ( !cal->mErrorOnLoad ) {
+                          int retval =  KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
+                        }
+                        cal = calendars.next();
+                    }
                     KOPrefs::instance()->mLastBackupDate =  daysTo;
-
                 } else if ( retval == 2 ){
                     qDebug("KO: Backup globally cancelled.");
                     // backup globally cancelled
                     KPimGlobalPrefs::instance()->mBackupEnabled = false;
                 }
                 // retval == 3: do nothing, try again later
             }
                 ; //  KPimGlobalPrefs::instance()->mLastBackupDate
         }
         QTime neededSaveTime = QDateTime::currentDateTime().time();
         setCaption(i18n("KO/Pi:Saving Data to File ..." ));
         qDebug("KO: Start saving data to file!");
         mView->saveCalendars();
         mCalendarModifiedFlag = false;
         int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
         qDebug("KO: Needed %d ms for saving.",msNeeded );
         QString savemes;
         savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
         setCaption(savemes);
     } else
         setCaption(i18n("Saving cancelled!"));
     mSyncManager->setBlockSave( false );
 }
 
 void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         e->ignore();
         // qDebug("  ignore  %d",e->isAutoRepeat()  );
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     KOPrefs *p = KOPrefs::instance();
     bool showSelectedDates = false;
     int size;
     int pro = 0;
     //qDebug("MainWindow::keyPressEvent ");
     switch ( e->key() ) {
     case Qt::Key_Right:
         if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)