recurrence fixes

2 files changed, 26 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index c1d07e4..ac1d5b7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,3 @@
 # Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Aug  9 12:10:32 2004
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Aug  9 13:18:13 2004
 # Project:  kopi-desktop.pro
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index bc1b863..596148e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -345,3 +345,3 @@ public:
         QString recurString = "no";
-        if ( repeating ) {
+        if ( repeating && repeat_frequency != -1) {
             recurString = "y";
@@ -361,6 +361,8 @@ public:
             QDate startDate, endDate;
-            if ( repeat_startdate.Day > 0 )
+            if ( repeat_startdate.Day > 0 ) {
                 startDate = datefromGSM ( &repeat_startdate );
-            else
+                event->setDtStart(QDateTime ( startDate, event->dtStart().time()));
+            } else {
                 startDate = event->dtStart().date();
+            }
             int freq = repeat_frequency;
@@ -373,3 +375,3 @@ public:
             uint weekDaysNum = repeat_dayofweek ;
-        
+            // 1 == monday, 7 == sunday
             QBitArray weekDays( 7 );
@@ -400,3 +402,3 @@ public:
             if (  repeat_weekofmonth >= 0 ) {
-                rtype = 2;
+                rtype = 2; // ************************ 2 MonthlyPos
                 pos = repeat_weekofmonth;
@@ -404,8 +406,22 @@ public:
                     dayOfWeek = repeat_dayofweek;
+                if (repeat_month > 0) {
+                    if ( repeat_month != event->dtStart().date().month() ) {
+                        QDate date (event->dtStart().date().year(),repeat_month,event->dtStart().date().day() );
+                        event->setDtStart(QDateTime ( date , event->dtStart().time()) ); 
+                    }  
+                    if ( freq == 1 )
+                        freq = 12;
+                }
             } else if ( repeat_dayofweek >= 0  ) {
-                rtype = 1;
-            } if ( repeat_dayofweek >= 0  ) {
-                rtype = 1;
+                rtype = 1;// ************************ 1 Weekly
+            } else if ( repeat_day >= 0  ) {
+                if ( repeat_month > 0) {
+                    rtype = 4;
+                } else {
+                    rtype = 3;
+                }
+            } else {
+                rtype = 0 ;
             }
-
+            
             if ( rtype == 0 ) {