1 files changed, 13 insertions, 8 deletions

diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 076cd3f..9307f12 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -347,11 +347,8 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
-      VObject *a = addProp(vtodo, VCDAlarmProp);
+        VObject *a;
       tmpStr = qDateTimeToISO(alarm->time());
-      addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
-      addPropValue(a, VCRepeatCountProp, "1");
-      addPropValue(a, VCDisplayStringProp, "beep!");
       if (alarm->type() == Alarm::Audio) {
         a = addProp(vtodo, VCAAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
@@ -363,6 +360,11 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
+        } else {
+            a = addProp(vtodo, VCDAlarmProp);
+            addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
+            addPropValue(a, VCRepeatCountProp, "1");
+            addPropValue(a, VCDisplayStringProp, "beep!");
       }
     }
   }
@@ -626,11 +628,8 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
   Alarm* alarm;
   for (alarm = alarms.first(); alarm; alarm = alarms.next()) {
     if (alarm->enabled()) {
-      VObject *a = addProp(vevent, VCDAlarmProp);
+          VObject *a ;
       tmpStr = qDateTimeToISO(alarm->time());
-      addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
-      addPropValue(a, VCRepeatCountProp, "1");
-      addPropValue(a, VCDisplayStringProp, "beep!");
       if (alarm->type() == Alarm::Audio) {
         a = addProp(vevent, VCAAlarmProp);
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
@@ -642,6 +641,12 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
         addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCProcedureNameProp, QFile::encodeName(alarm->programFile()));
+          } else {
+              a = addProp(vevent, VCDAlarmProp);
+              addPropValue(a, VCRunTimeProp, tmpStr.local8Bit());
+              addPropValue(a, VCRepeatCountProp, "1");
+              addPropValue(a, VCDisplayStringProp, "beep!");
+          
       }
     }
   }