4 files changed, 31 insertions, 15 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 43bc343..34e9b7f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1498,14 +1498,14 @@
 { "All events","Alle Termine" },
 { "Allday events","Ganztagestermine" },
 { "Events with time","Termine mit Zeit" },
-{ "No conflict found within the next two years","Kein Konflikt innerhalb der nächsten zwei Jahre gefunden" },
+{ "No conflict found","Kein Konflikt gefunden" },
 { "Conflict %1 <-> %2","Konflikt %1 <-> %2" },
 { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " },
 { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" },
 { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" },
 { "KO/Pi Conflict delected","KO/Pi Konflikt erkannt" },
 { "Show date","Zeige Datum" },
-{ "No problem!","Kein Problem!" },
+{ "No problem!","Null Problemo!" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 65750af..426e8f9 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -661,34 +661,49 @@ void CalendarView::nextConflict( bool all, bool allday )
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
+        test = testlist.next();
     }
     QDateTime startDT = QDateTime (mNavigator->selectedDates().first().addDays(1), QTime ( 0,0,0));
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
+    Event * cE2 = 0;
     QPtrList<Event> testlist2 = testlist;
+    test = testlist.first();
+    bool skip = false;
     while ( test ) {
+        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, true ) ) {
+                        if ( test->isOverlapping ( test2, &retVal, &startDT ) ) {
+                            //qDebug("overlap ");
                     if ( ! found ) {
                         if ( retVal >= startDT ) {
                             conflict = retVal; 
                             cE = test;
+                                    cE2 = test2;
                             found = true;
                         }
                     } else {
                         if ( retVal >= startDT && retVal < conflict ) {
                             conflict = retVal; 
                             cE = test;
+                                    cE2 = test2;
+                                }
                         }
                     }
                 }
             }
             test2 = testlist2.next();
         }
+        }
         test->setTagged( true );
         test = testlist.next();
     }
@@ -698,11 +713,11 @@ void CalendarView::nextConflict( bool all, bool allday )
         mNavigator->slotDaySelect( conflict.date() );
         int hour = conflict.time().hour();
         mViewManager->agendaView()->setStartHour( hour  );
-        topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
+        topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
         return;
     }
 
-    topLevelWidget()->setCaption( i18n("No conflict found within the next two years") );
+    topLevelWidget()->setCaption( i18n("No conflict found") );
     qDebug("No conflict found ");
     return;
 
@@ -2794,9 +2809,10 @@ void CalendarView::checkConflictForEvent()
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
+    QDateTime current = QDateTime::currentDateTime();
     while ( test ) {
         if ( !test->doesFloat() ) {
-            if ( mConflictingEvent->isOverlapping ( test, &retVal, true ) ) {
+            if ( mConflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                 if ( ! found ) {
                     conflict = retVal; 
                     cE = test;
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 235ae55..46e8174 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -171,7 +171,7 @@ void Event::setDuration(int seconds)
   setHasEndDate(false);
   Incidence::setDuration(seconds);
 }
-bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, bool inFutureOnly )
+bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime* startDT )
 {
     if ( testEvent == this )
         return false;
@@ -191,8 +191,8 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, bool inFut
                 *overlapDT =  testEvent->mDtStart;
             else
                 *overlapDT =  mDtStart;
-            if ( inFutureOnly )
-                return (*overlapDT >= QDateTime::currentDateTime() );
+            if ( startDT )
+                return (*overlapDT >= *startDT );
             return true;
         }
         return false;
@@ -215,7 +215,7 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, bool inFut
             enr = nonRecur->mDtEnd;
         if ( enr < recurEvent->mDtStart )
             return false;
-        if ( inFutureOnly && enr < QDateTime::currentDateTime() )
+        if ( startDT && enr < *startDT )
             return false;
         int recDuration = recurEvent->mDtStart.secsTo( recurEvent->mDtEnd );
         if ( recurEvent->doesFloat() )
@@ -233,8 +233,8 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, bool inFut
                         *overlapDT =  recStart;
                     else
                         *overlapDT =  nonRecur->mDtStart;
-                    if ( inFutureOnly ) {
-                        if ( *overlapDT >= QDateTime::currentDateTime() )
+                    if ( startDT  ) {
+                        if ( *overlapDT >= *startDT )
                             return true;
                     } else
                         return true;
@@ -274,8 +274,8 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, bool inFut
                     *overlapDT =  testincidenceStart;
                 else
                     *overlapDT =  incidenceStart; 
-                if ( inFutureOnly ) {
-                    if ( *overlapDT >= QDateTime::currentDateTime() )
+                if (  startDT ) {
+                    if ( *overlapDT >= *startDT )
                         return true;
                 } else
                     return true;
diff --git a/libkcal/event.h b/libkcal/event.h
index 80c11c4..e6055a5 100644
--- a/libkcal/event.h
+++ b/libkcal/event.h
@@ -74,7 +74,7 @@ class Event : public Incidence
 
     bool contains ( Event*);
 
-    bool isOverlapping (  Event*,  QDateTime*, bool inFutureOnly );
+    bool isOverlapping (  Event*,  QDateTime*, QDateTime* );
 
   private:
     bool accept(Visitor &v) { return v.visit(this); }