minor fixes

3 files changed, 23 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index cfaec5a..c1d07e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #############################################################################
 # Makefile for building: kopi-desktop
-# Generated by qmake (1.07a) (Qt 3.3.2) on: Sun Aug  8 12:23:00 2004
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Aug  9 12:10:32 2004
 # Project:  kopi-desktop.pro
 # Template: subdirs
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 7e1c9cd..94744fb 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -171,6 +171,12 @@ public:
             alarm->setEnabled( true );
             int alarmOffset = alarmDt.secsTo(  todo->dtStart() );
-            alarm->setStartOffset( alarmOffset );
+            alarm->setStartOffset( -alarmOffset );
             alarmString = QString::number( alarmOffset );
+        } else {
+            Alarm *alarm;
+            if (  todo->alarms().count() > 0 ) {
+                alarm = todo->alarms().first();
+                alarm->setEnabled( false );
+            }
         }
         // csum *****************************************
@@ -449,6 +455,12 @@ public:
             alarm->setEnabled( true );
             int alarmOffset = alarmDt.secsTo(  event->dtStart() );
-            alarm->setStartOffset( alarmOffset );
+            alarm->setStartOffset( -alarmOffset );
             alarmString = QString::number( alarmOffset );
+        } else {
+            Alarm *alarm;
+            if (  event->alarms().count() > 0 ) {
+                alarm = event->alarms().first();
+                alarm->setEnabled( false );
+            }
         }
         // csum *****************************************
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 4e54fdf..f8b066d 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -166,4 +166,6 @@ class SharpParser : public QObject
                     r->addYearlyNum( startDate.month() );
                 }
+            } else {
+                event->recurrence()->unsetRecurs();
             }
         
@@ -184,4 +186,10 @@ class SharpParser : public QObject
                 int alarmOffset = attList[9].toInt();
                 alarm->setStartOffset( alarmOffset * -60 );
+            } else {
+                Alarm *alarm;
+                if (  event->alarms().count() > 0 ) {
+                    alarm = event->alarms().first();
+                    alarm->setEnabled( false );
+                }
             }