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
@@ -326,64 +326,66 @@ VObject *VCalFormat::eventToVTodo(const Todo *anEvent)
   for ( QStringList::Iterator it = tmpStrList.begin();
         it != tmpStrList.end();
         ++it ) {
     catStr = *it;
     if (catStr[0] == ' ')
       tmpStr += catStr.mid(1);
     else
       tmpStr += catStr;
     // this must be a ';' character as the vCalendar specification requires!
     // vcc.y has been hacked to translate the ';' to a ',' when the vcal is
     // read in.
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vtodo, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // alarm stuff
   kdDebug(5800) << "vcalformat::eventToVTodo was called" << endl;
   QPtrList<Alarm> alarms = anEvent->alarms();
   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());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
       }
       else if (alarm->type() == Alarm::Procedure) {
         a = addProp(vtodo, VCPAlarmProp);
         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!");
       }
     }
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
     addPropValue(vtodo, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
     addPropValue(vtodo, XPilotStatusProp, tmpStr.local8Bit());
   }
 
   return vtodo;
 }
 
 VObject* VCalFormat::eventToVEvent(const Event *anEvent)
 {
   VObject *vevent;
   QString tmpStr;
   QStringList tmpStrList;
 
   vevent = newVObject(VCEventProp);
 
   // start and end time
@@ -605,64 +607,67 @@ VObject* VCalFormat::eventToVEvent(const Event *anEvent)
     tmpStr += ";";
   }
   if (!tmpStr.isEmpty()) {
     tmpStr.truncate(tmpStr.length()-1);
     addPropValue(vevent, VCCategoriesProp, tmpStr.local8Bit());
   }
 
   // attachments 
   // TODO: handle binary attachments!
   QPtrList<Attachment> attachments = anEvent->attachments();
   for ( Attachment *at = attachments.first(); at; at = attachments.next() )
     addPropValue(vevent, VCAttachProp, at->uri().local8Bit());
 
   // resources
   tmpStrList = anEvent->resources();
   tmpStr = tmpStrList.join(";");
   if (!tmpStr.isEmpty())
     addPropValue(vevent, VCResourcesProp, tmpStr.local8Bit());
 
   // alarm stuff
   QPtrList<Alarm> alarms = anEvent->alarms();
   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());
         addPropValue(a, VCRepeatCountProp, "1");
         addPropValue(a, VCAudioContentProp, QFile::encodeName(alarm->audioFile()));
       }
       if (alarm->type() == Alarm::Procedure) {
         a = addProp(vevent, VCPAlarmProp);
         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!");
+          
       }
     }
   }
 
   // priority
   tmpStr.sprintf("%i",anEvent->priority());
   addPropValue(vevent, VCPriorityProp, tmpStr.local8Bit());
 
   // transparency
   tmpStr.sprintf("%i",anEvent->transparency());
   addPropValue(vevent, VCTranspProp, tmpStr.local8Bit());
 
   // related event
   if (anEvent->relatedTo()) {
     addPropValue(vevent, VCRelatedToProp,
                  anEvent->relatedTo()->uid().local8Bit());
   }
 
   if (anEvent->pilotId()) {
     // pilot sync stuff
     tmpStr.sprintf("%i",anEvent->pilotId());
     addPropValue(vevent, XPilotIdProp, tmpStr.local8Bit());
     tmpStr.sprintf("%i",anEvent->syncStatus());
     addPropValue(vevent, XPilotStatusProp, tmpStr.local8Bit());