Fixed some problems with the recurrence

1 files changed, 12 insertions, 8 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 32a1337..964ffe3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1394,3 +1394,3 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
             frequ = ICAL_MONTHLY_RECURRENCE;
-            interv = 12;
+            interv = 12* r.interval;
         }
@@ -1501,2 +1501,3 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
         if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+            qDebug(" YEARLY  DAY OF YEAR");
             if (!icaltime_is_null_time(r.until)) {
@@ -1515,2 +1516,3 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
             if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+                qDebug("YEARLY POS NOT SUPPORTED BY GUI");
                 if (!icaltime_is_null_time(r.until)) {
@@ -1545,2 +1547,3 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
             } else { 
+                qDebug("YEARLY MONTH ");
                 if (!icaltime_is_null_time(r.until)) {
@@ -1554,11 +1557,12 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                 }
-            }
-            if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
-                index = 0;
-                while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
-                    recur->addYearlyNum(day);
+                if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
+                    index = 0;
+                    while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
+                        recur->addYearlyNum(day);
+                    }
+                } else {
+                    recur->addYearlyNum(incidence->dtStart().date().month());
                 }
-            } else {
-                recur->addYearlyNum(incidence->dtStart().date().month());
             }
+
         }