1 files changed, 6 insertions, 2 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 32a1337..964ffe3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1383,25 +1383,25 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
     int frequ = r.freq;
     int interv = r.interval;
     // preprocessing for odd recurrence definitions
     
     if ( r.freq == ICAL_MONTHLY_RECURRENCE ) {
         if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX) {
             interv = 12;
         }
     }
     if ( r.freq == ICAL_YEARLY_RECURRENCE ) {
         if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX && r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
             frequ = ICAL_MONTHLY_RECURRENCE;
-            interv = 12;
+            interv = 12* r.interval;
         }
     }
   
     switch (frequ) {
     case ICAL_MINUTELY_RECURRENCE:
         if (!icaltime_is_null_time(r.until)) {
             recur->setMinutely(interv,readICalDateTime(r.until));
         } else {
             if (r.count == 0)
                 recur->setMinutely(interv,-1);
             else
                 recur->setMinutely(interv,r.count);
@@ -1490,38 +1490,40 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                     recur->setMonthly(Recurrence::rMonthlyDay,interv,-1);
                 else
                     recur->setMonthly(Recurrence::rMonthlyDay,interv,r.count);
             }
             while((day = r.by_month_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 //          kdDebug(5800) << "----b " << day << endl;
                 recur->addMonthlyDay(day);
             }
         }
         break;
     case ICAL_YEARLY_RECURRENCE:
         if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+            qDebug(" YEARLY  DAY OF YEAR");
             if (!icaltime_is_null_time(r.until)) {
                 recur->setYearly(Recurrence::rYearlyDay,interv,
                                  readICalDate(r.until));
             } else {
                 if (r.count == 0)
                     recur->setYearly(Recurrence::rYearlyDay,interv,-1);
                 else
                     recur->setYearly(Recurrence::rYearlyDay,interv,r.count);
             }
             while((day = r.by_year_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
                 recur->addYearlyNum(day);
             }
         } else if ( true /*r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX*/) {
             if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+                qDebug("YEARLY POS NOT SUPPORTED BY GUI");
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyPos,interv,
                                      readICalDate(r.until));
                 } else {
                     if (r.count == 0)
                         recur->setYearly(Recurrence::rYearlyPos,interv,-1);
                     else
                         recur->setYearly(Recurrence::rYearlyPos,interv,r.count);
                 }
                 bool useSetPos = false;
                 short pos = 0;
                 while((day = r.by_day[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
@@ -1534,43 +1536,45 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                         recur->addYearlyMonthPos(pos,ba);
                     } else {
                         qba.setBit((day+5)%7);    // convert from Sunday=1 to Monday=0
                         useSetPos = true;
                     }
                 }
                 if (useSetPos) {
                     if (r.by_set_pos[0] != ICAL_RECURRENCE_ARRAY_MAX) {
                         recur->addYearlyMonthPos(r.by_set_pos[0],qba);
                     }
                 }
             } else { 
+                qDebug("YEARLY MONTH ");
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyMonth,interv,
                                      readICalDate(r.until));
                 } else {
                     if (r.count == 0)
                         recur->setYearly(Recurrence::rYearlyMonth,interv,-1);
                     else
                         recur->setYearly(Recurrence::rYearlyMonth,interv,r.count);
                 }
-            }
             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());
             }
         }
+
+        }
       break;
   default:
       ;
       break;
   }
 }
 
 void ICalFormatImpl::readAlarm(icalcomponent *alarm,Incidence *incidence)
 {
   //kdDebug(5800) << "Read alarm for " << incidence->summary() << endl;
 
   Alarm* ialarm = incidence->newAlarm();