1 files changed, 4 insertions, 4 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index f9685e9..ab69158 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -664,33 +664,35 @@ void CalendarView::nextConflict( bool all, bool allday )
         test->setTagged( false );
         test = testlist.next();
     }
     QTime st ( 0,0,0);
     if ( mViewManager->currentView() == mViewManager->agendaView()  )
         st = mViewManager->agendaView()->agenda()->getEndTime();
     //qDebug("time %s ", st.toString().latin1());
     QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     Event * cE2 = 0;
     QPtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     while ( test ) {
+        qApp->processEvents();
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
             Event * test2 = testlist2.first();
             while ( test2 ) { 
                 skip = false;
                 if ( !all ) skip = ( allday != test2->doesFloat() );
                 if ( !skip ) {
                     if ( !test2->isTagged() ) {
                         if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
                             //qDebug("overlap ");
                             if ( ! found ) {
                                 if ( retVal >= startDT ) {
                                     conflict = retVal; 
                                     cE = test;
                                     cE2 = test2;
@@ -2755,44 +2757,42 @@ void CalendarView::changeEventDisplay(Event *which, int action)
         mTodoList->updateView();
         if (  action != KOGlobals::EVENTDELETED ) {
             mConflictingEvent = which ;
             QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) );
         }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 void CalendarView::checkConflictForEvent()
 {
 
     if (!KOPrefs::instance()->mConfirm)
         return;
     if ( ! mConflictingEvent ) return;
-    if (  mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
-        mConflictingEvent = 0;
-        return;
-    }
+    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     QDateTime current = QDateTime::currentDateTime();
     while ( test ) {
+        qApp->processEvents();
         if ( !test->doesFloat() ) {
             if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
                 } else {
                     if ( retVal < conflict ) {
                         conflict = retVal; 
                         cE = test;
                     }
                 }
                 found = true;
             }
         }
         test = testlist.next();
     }