5 files changed, 24 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 4b3f806..558fc55 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2669,2 +2669,11 @@ void CalendarView::updateView()
 {
+    static bool clearallviews = false;
+    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
+        if ( clearallviews ) {
+            clearAllViews();
+            clearallviews = false;
+        }
+        return;
+    }
+    clearallviews = true;
     DateList tmpList = mNavigator->selectedDates();
@@ -4413,2 +4422,7 @@ void CalendarView::deleteIncidence(Incidence *incidence)
     //qDebug(" CalendarView::deleteIncidence ");
+    if ( incidence == 0 ) {
+        updateView();
+        emit updateSearchDialog();
+        return;
+    }
     if ( incidence ) {
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 25e599d..5690bdb 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -867,3 +867,3 @@ void KOListView::deleteAll()
             dia.show();
-            
+            KOPrefs::instance()->mGlobalUpdateDisabled = true;
             while ( incidence ) {
@@ -880,2 +880,4 @@ void KOListView::deleteAll()
             }
+            KOPrefs::instance()->mGlobalUpdateDisabled = false;
+            emit deleteIncidenceSignal( 0 ); 
             mess = mess.sprintf( i18n("%d items remaining in list."), count() );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 138028d..a63297e 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -55,2 +55,3 @@ KOPrefs::KOPrefs() :
 {
+    mGlobalUpdateDisabled = false;
   mCategoryColors.setAutoDelete(true);
@@ -321,3 +322,3 @@ KOPrefs::KOPrefs() :
   addItemBool("WTshowChanged",&mWTshowChanged,false);
-  mCalendars.setAutoDelete( true );
+  mCalendars.setAutoDelete( true ); 
 }
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 0779e27..392360d 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -347,2 +347,3 @@ class KOPrefs : public KPimPrefs
     int mNextAvailableCalendar;
+    bool mGlobalUpdateDisabled;
 
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 2e32ac2..9cfdc35 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -256,2 +256,6 @@ void SearchDialog::updateList()
 {
+    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
+        listView->clear();
+        return;
+    }
     //listView->updateList();