1 files changed, 20 insertions, 0 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 940ea91..ccacc52 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1452,6 +1452,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         else
                             idS = inR->IDStr();
+                        int calID = inR->calID();
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
+                        inR->setCalID( calID );
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
@@ -1464,6 +1466,8 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         idS = inL->IDStr();
                         int pid = inL->pilotId();
+                        int calID = inL->calID();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
+                        inL->setCalID( calID );
                         if ( mSyncManager->syncWithDesktop() )
                             inL->setPilotId( pid  );
@@ -1494,4 +1498,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
+                            
+                            inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
@@ -1503,4 +1509,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL = inR->clone();
                             inL->setIDStr( ":" );
+                            inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
@@ -1560,4 +1567,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inR->setIDStr( ":" );
                                 inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
+                                inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
@@ -1574,4 +1582,5 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
+                                inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
@@ -2144,4 +2153,13 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     return false;
 }
+void CalendarView::mergeFile( QString fn )
+{
+    clearAllViews();
+    mCalendar->mergeCalendarFile( fn ); 
+    mCalendar->reInitAlarmSettings();
+    setSyncEventsReadOnly();
+    updateUnmanagedViews();
+    updateView();
+}
 void CalendarView::showOpenError()
 {
@@ -3359,4 +3377,5 @@ void CalendarView::newEvent()
 
     QDate date = mNavigator->selectedDates().first();
+#if 0
     QDateTime current =  QDateTime::currentDateTime();
     if ( date <= current.date() ) {
@@ -3365,4 +3384,5 @@ void CalendarView::newEvent()
                   QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
     } else
+#endif
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                   QDateTime( date, QTime( KOPrefs::instance()->mStartTime +