1 files changed, 66 insertions, 9 deletions

diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 46e8174..5285559 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -197,6 +197,13 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime*
         }
         return false;
     }
+    if ( !doesFloat() && !testEvent->doesFloat() && !isMultiDay() && !testEvent->isMultiDay() ) {
+        if ( mDtStart.time() >=  testEvent->mDtEnd.time() || testEvent->mDtStart.time() >=  mDtEnd.time() ) {
+            // no need to test. times mismatch
+            //fprintf(stderr,"timi ");
+            return false;
+        }
+    }
     Event *nonRecur = 0;
     Event *recurEvent = 0;
     if ( ! doesRecur() ) {
@@ -217,11 +224,23 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime*
             return false;
         if ( startDT && enr < *startDT )
             return false;
+        
         int recDuration = recurEvent->mDtStart.secsTo( recurEvent->mDtEnd );
         if ( recurEvent->doesFloat() )
             recDuration += 86400;
-        bool ok = true;
-        QDateTime recStart = recurEvent->mDtStart.addSecs( -300);;
+        bool ok = false;
+        QDateTime recStart;
+        if ( startDT ) {
+            recStart = recurEvent->recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok );
+        }
+        if ( recStart.isValid() ) {
+            //qDebug("%s start at %s ", startDT->  toString().latin1(),       recStart.toString().latin1());
+            recStart =  recStart.addSecs( -300);
+        }
+        else
+            recStart = recurEvent->mDtStart.addSecs( -300);
+        ok = true;
+
         while ( ok ) {
             recStart = recurEvent->getNextOccurence( recStart.addSecs( 60 ), &ok );
             if ( ok ) {
@@ -243,31 +262,68 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime*
         }
         return false;
     }
-    
-    QDateTime incidenceStart = mDtStart;
+     if ( !doesFloat() && !testEvent->doesFloat() && !isMultiDay() && !testEvent->isMultiDay() ) {
+         if ( recurrence()->doesRecur() == Recurrence::rWeekly &&  testEvent->recurrence()->doesRecur() == Recurrence::rWeekly ) {
+             bool found = false;
+             uint i;
+             for ( i=0; i< recurrence()->days().size();++i ) {
+                 found =  found || (recurrence()->days().testBit( i ) && testEvent->recurrence()->days().testBit( i ) );
+             }
+             if ( ! found ) {
+                 //qDebug("recurring days mismatch %s -- %s", summary().latin1(),testEvent->summary().latin1());
+                 return false;
+             }
+
+         }
+    }
+    bool ok = true;
+    QDateTime incidenceStart;// = mDtStart;
+    QDateTime testincidenceStart;// = testEvent->mDtStart;
+    if ( startDT ) {
+        incidenceStart = recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok );
+        testincidenceStart = testEvent->recurrence()->getPreviousDateTime( startDT->addSecs( 61 ), &ok );
+    }
+    if ( !testincidenceStart.isValid() )
+        testincidenceStart = testEvent->mDtStart;
+    if ( !incidenceStart.isValid() )
+        incidenceStart = mDtStart;
     int duration = mDtStart.secsTo( mDtEnd );
     if ( doesFloat() )
             duration += 86400;
-    QDateTime testincidenceStart = testEvent->mDtStart;
     int testduration = testEvent->mDtStart.secsTo( testEvent->mDtEnd );
     if ( testEvent->doesFloat() )
             testduration += 86400;
     bool computeThis = false;
     if ( incidenceStart < testincidenceStart )
         computeThis = true;
-    bool ok = true;
     if ( computeThis )
         incidenceStart = incidenceStart.addSecs( -300 );
     else
         testincidenceStart = testincidenceStart.addSecs( -300 );
     int count = 0;
+    ok = true;
+    int countbreak = 2000;
+    QDateTime stopSearch;
+    bool testStop = false;
+    if ( startDT ) {
+        stopSearch = startDT->addDays( 365*3 );
+        testStop = true;
+    }
     while ( ok ) {
         ++count;
-        if ( count > 1000 ) break;
-        if ( computeThis )
+        if ( count > countbreak ) break;
+        if ( computeThis ) {
+            if ( testStop ) 
+                if ( testincidenceStart > stopSearch )
+                    break;
             incidenceStart = getNextOccurence( incidenceStart.addSecs( 60 ), &ok );
-        else
+        }
+        else {
+            if ( testStop ) 
+                if ( incidenceStart > stopSearch )
+                    break;
             testincidenceStart = testEvent->getNextOccurence( testincidenceStart.addSecs( 60 ), &ok );
+        }
         if ( ok ) {
             if ( incidenceStart < testincidenceStart.addSecs( testduration ) && testincidenceStart < incidenceStart.addSecs( duration ) ) {
                 if ( incidenceStart < testincidenceStart )
@@ -284,6 +340,7 @@ bool Event::isOverlapping (  Event* testEvent,  QDateTime* overlapDT, QDateTime*
         }
         
     }
+    //qDebug("%d rec counter stopped at %d - %s %s", ok ,count, summary().latin1(),testEvent->summary().latin1() );
     return false;
 }
 QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const