clear view fixes

1 files changed, 17 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 608b73b..e13d0be 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1141,12 +1141,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     Event* eventR;
     QString uid;
     int take;
     Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
+    clearAllViews();
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
     if ( mSyncManager->syncWithDesktop() ) {
@@ -1833,14 +1834,14 @@ bool CalendarView::openCalendar(QString filename, bool merge)
     if (!QFile::exists(filename)) {
         KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename));
         return false;
     }
 
     globalFlagBlockAgenda = 1;
+    clearAllViews();
     if (!merge) {
-      mTodoList->clearList();
       mViewManager->setDocumentId( filename );
       mCalendar->close();
     }
     mStorage->setFileName( filename );
 
     if ( mStorage->load() ) {
@@ -1945,13 +1946,14 @@ bool CalendarView::checkFileVersion(QString fn)
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
-    mCalendar->deleteEvent ( e );
+    if ( e )
+        deleteEvent ( e );
     updateView();
     return true;
 }
 
 bool CalendarView::saveCalendar( QString filename )
 {
@@ -1978,12 +1980,13 @@ bool CalendarView::saveCalendar( QString filename )
 }
 
 void CalendarView::closeCalendar()
 {
  
     // child windows no longer valid
+    clearAllViews();
     emit closingDown();
 
     mCalendar->close();
     setModified(false);
     updateView();
 }
@@ -2429,12 +2432,23 @@ void CalendarView::updateView(const QDate &start, const QDate &end)
 {
     mTodoList->updateView();
     mViewManager->updateView(start, end);
     //mDateNavigator->updateView();
 }
 
+void CalendarView::clearAllViews()
+{
+    mTodoList->clearList();
+    mViewManager->clearAllViews();
+    SearchDialog * sd = mDialogManager->getSearchDialog();
+    if ( sd ) {
+        KOListView* kol = sd->listview();
+        if ( kol )
+            kol->clearList();
+    }
+}
 void CalendarView::updateView()
 {
     DateList tmpList = mNavigator->selectedDates();
 
     if ( KOPrefs::instance()->mHideNonStartedTodos ) 
         mTodoList->updateView();
@@ -3940,12 +3954,13 @@ void CalendarView::takeOverEvent()
 }
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
+    clearAllViews();
     QPtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
         events.at(i)->setOrganizer(KOPrefs::instance()->email());
         events.at(i)->recreate();
         events.at(i)->setReadOnly(false);
     }