[Opensync-commits] r6155 - in format-plugins/vformat: . src

[<svn...@op...>]

Author: cstender
Date: Mon Nov  8 14:29:45 2010
New Revision: 6155
URL: http://www.opensync.org/changeset/6155

Log:
* src/xmlformat-vcalendar.c (handle_vcal_alarm_attribute): do not include
AlarmRepeat, AlarmRepeatDuration, AlarmTrigger in XML if the fields in the
DALARM are null (bug #1268)

Patch by Graham Cobb

Deleted:
   format-plugins/vformat/ChangeLog
Modified:
   format-plugins/vformat/src/xmlformat-vcalendar.c

Modified: format-plugins/vformat/src/xmlformat-vcalendar.c
==============================================================================
--- format-plugins/vformat/src/xmlformat-vcalendar.c	Sun Nov  7 14:07:12 2010	(r6154)
+++ format-plugins/vformat/src/xmlformat-vcalendar.c	Mon Nov  8 14:29:45 2010	(r6155)
@@ -174,9 +174,13 @@
 		FIXME_xmlfield_set_key_value(xmlfield, "AlarmDescription", vformat_attribute_get_nth_value(attr, 3));
 	}
 
-	FIXME_xmlfield_set_key_value(xmlfield, "AlarmRepeat", vformat_attribute_get_nth_value(attr, 2));
-	FIXME_xmlfield_set_key_value(xmlfield, "AlarmRepeatDuration", vformat_attribute_get_nth_value(attr, 1));
-	FIXME_xmlfield_set_key_value(xmlfield, "AlarmTrigger", vformat_attribute_get_nth_value(attr, 0)); 
+	const char *v;
+	v = vformat_attribute_get_nth_value(attr, 2);
+	if (v && *v) FIXME_xmlfield_set_key_value(xmlfield, "AlarmRepeat", v);
+	v = vformat_attribute_get_nth_value(attr, 1);
+	if (v && *v) FIXME_xmlfield_set_key_value(xmlfield, "AlarmRepeatDuration", v);
+	v = vformat_attribute_get_nth_value(attr, 0);
+	if (v && *v) FIXME_xmlfield_set_key_value(xmlfield, "AlarmTrigger", v); 
 	return xmlfield; 
 }