Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > d96701ed90d60bf737e8c706be49f444 > files > 3

kdepimlibs4-4.1.2-3mdv2009.0.src.rpm

# 
# Fix mixing weeks and days/time in ical durations (2nd attempt)
# 

Index: kcal/icalformat_p.cpp
===================================================================
--- kcal/icalformat_p.cpp	(revision 865202)
+++ kcal/icalformat_p.cpp	(revision 865203)
@@ -2225,14 +2225,18 @@
   if ( duration.isDaily() ) {
     if ( !( value % 7 ) ) {
       d.weeks = value / 7;
+      d.days  = 0;
     } else {
+      d.weeks = 0;
       d.days  = value;
       d.hours = d.minutes = d.seconds = 0;
     }
   } else {
     if ( !( value % gSecondsPerWeek ) ) {
       d.weeks = value / gSecondsPerWeek;
+      d.days = d.hours = d.minutes = d.seconds = 0;
     } else {
+      d.weeks   = 0;
       d.days    = value / gSecondsPerDay;
       value    %= gSecondsPerDay;
       d.hours   = value / gSecondsPerHour;