Kolab Groupware OBS

libkolabxml.spec Changed

debian.changelog Changed

libkolabxml-1.2.tar.gz/src/containers/kolabcontainers.cpp Changed

libkolabxml-1.2.tar.gz/src/containers/kolabcontainers.h Changed

libkolabxml-1.2.tar.gz/src/xcalconversions.h Changed

@@ -1351,7 +1351,9 @@
             case Kolab::Alarm::AudioAlarm:
                 p = std::auto_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
                 p->description(PropType::description_type(alarm.description()));
-                p->attach(fromAttachment(alarm.audioFile()));
+                if (alarm.audioFile().isValid()) {
+                    p->attach(fromAttachment(alarm.audioFile()));
+                }
                 break;
             case Kolab::Alarm::InvalidAlarm:
                 break;
@@ -1398,16 +1400,17 @@
             }
             alarm = Kolab::Alarm((*prop.summary()).text(), (*prop.description()).text(), attendees);
         } else if (prop.action().text() == AUDIOALARM) {
-            if (!prop.attach()) {
-                ERROR("audio file is missing");
-                continue;
-            }
-            const Kolab::Attachment &attach = toAttachment<icalendar_2_0::properties::attach_type>(*prop.attach());
-            if (!attach.isValid()) {
-                ERROR("audio file is invalid");
-                continue;
+            if (prop.attach()) {
+                const Kolab::Attachment &attach = toAttachment<icalendar_2_0::properties::attach_type>(*prop.attach());
+                if (!attach.isValid()) {
+                    ERROR("audio file is invalid");
+                    continue;
+                }
+                alarm = Kolab::Alarm(attach);
+            } else {
+                //An audio alarm without an audio file is valid according to spec
+                alarm = Kolab::Alarm(Kolab::Alarm::AudioAlarm);
             }
-            alarm = Kolab::Alarm(attach);
         } else {
             ERROR("unknown alarm type " + prop.action().text());
             continue;

libkolabxml-1.2.tar.gz/tests/bindingstest.cpp Changed

libkolabxml.dsc Changed

Changes of Revision 11