[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs/kcal
From:       Allen Winter <winter () kde ! org>
Date:       2010-05-13 14:15:18
Message-ID: 20100513141518.3D26DAC8B4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1126282 by winterz:

merge forward SVN commit 1126014 by winterz:

more fixes to make recurring to-dos work.
part of the fix for kolab/issue3963


 M  +2 -11     calendar.cpp  


--- trunk/KDE/kdepimlibs/kcal/calendar.cpp #1126281:1126282
@@ -1291,14 +1291,9 @@
           alarmStart =
             offset.end( a->hasEndOffset() ? e->dtEnd() : e->dtStart() );
         } else if ( incidence->type() == "Todo" ) {
-          if ( a->hasEndOffset() ) {
-            if ( t->hasDueDate() ) {
-              alarmStart = offset.end( t->dtDue() );
-            } else if ( t->hasStartDate() ) {
-              alarmStart = offset.end( t->dtStart() );
+          alarmStart =
+            offset.end( a->hasEndOffset() ? t->dtDue() : t->dtStart() );
             }
-          }
-        }
 
         if ( alarmStart.isValid() && alarmStart > to ) {
           continue;
@@ -1308,12 +1303,8 @@
         if ( incidence->type() == "Event" ) {
           baseStart = e->dtStart();
         } else if ( incidence->type() == "Todo" ) {
-          if ( t->hasStartDate() ) {
-            baseStart = t->dtStart();
-          } else if ( t->hasDueDate() ) {
             baseStart = t->dtDue();
           }
-        }
         if ( alarmStart.isValid() && from > alarmStart ) {
           alarmStart = from;   // don't look earlier than the earliest alarm
           baseStart = (-offset).end( (-endOffset).end( alarmStart ) );
[prev in list] [next in list] [prev in thread] [next in thread]