summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Murchison <murch@andrew.cmu.edu>2015-01-20 08:47:31 -0500
committerKen Murchison <murch@andrew.cmu.edu>2015-01-20 08:47:31 -0500
commit58f3db14b755f4d012c6d03d73fd7d6345fa6edd (patch)
treeb94bc62d7feca9977034bc422e9f2a9b6c04db99
parent90118799288ca7f543368d5a0f744a79fbac733e (diff)
downloadlibical-git-58f3db14b755f4d012c6d03d73fd7d6345fa6edd.tar.gz
Updated VPOLL to draft-york-vpoll-03 (restrictions are still a work in progress)
-rw-r--r--design-data/components.txt2
-rwxr-xr-xdesign-data/parameters.csv3
-rwxr-xr-xdesign-data/params-in-prop.txt7
-rw-r--r--design-data/properties.csv3
-rw-r--r--design-data/restrictions.csv74
-rw-r--r--design-data/value-types.csv3
-rw-r--r--src/libical/icalcomponent.c12
-rw-r--r--src/libical/icalcomponent.h2
-rw-r--r--src/libical/icalenums.h4
-rw-r--r--src/libical/icalvalue.c4
10 files changed, 94 insertions, 20 deletions
diff --git a/design-data/components.txt b/design-data/components.txt
index 04ae2703..2d7603b0 100644
--- a/design-data/components.txt
+++ b/design-data/components.txt
@@ -13,6 +13,7 @@ VPOLL
VSCHEDULE
VTIMEZONE
VTODO
+VVOTER
X
XAUDIOALARM
XAVAILABLE
@@ -23,3 +24,4 @@ XLICINVALID
XMIMEPART
XPROCEDUREALARM
XSTANDARDTIME
+XVOTE
diff --git a/design-data/parameters.csv b/design-data/parameters.csv
index 1a03eb00..52cff942 100755
--- a/design-data/parameters.csv
+++ b/design-data/parameters.csv
@@ -40,9 +40,10 @@
"#In practice any unknown paramater that is not an xparam is treated as an ianaparam"
"IANA","33","const char*",
"ANY","0",,
-"#VPOLL Parameters","draft-york-vpoll",
+"#VPOLL Parameters","draft-york-vpoll","PUBLIC-COMMENT and RESPONSE are deprecated"
"PUBLIC-COMMENT","37","const char*",
"RESPONSE","38","int",
+"REQUIRED","43","icalparameter_required","X=20112;TRUE;FALSE;NONE"
"STAY-INFORMED","39","icalparameter_stayinformed","X=20108;TRUE;FALSE;NONE"
"#Caldav Attachment Parameters","draft-daboo-caldav-attachments"
"MANAGED-ID","40","const char*",
diff --git a/design-data/params-in-prop.txt b/design-data/params-in-prop.txt
index 2a803218..613bdd52 100755
--- a/design-data/params-in-prop.txt
+++ b/design-data/params-in-prop.txt
@@ -58,8 +58,11 @@ TARGET X
EXPAND X
BUSYTYPE X
ACCEPT-RESPONSE X
-POLL-ITEM-ID PUBLIC-COMMENT RESPONSE STAY-INFORMED X
+POLL-COMPLETION X
+POLL-ITEM-ID X
POLL-MODE X
POLL-PROPERTIES X
POLL-WINNER X
-VOTER CN CUTYPE DELEGATED-FROM DELEGATED-TO DIR LANGUAGE MEMBER RESPONSE ROLE RSVP SCHEDULE-AGENT SCHEDULE-FORCE-SEND SCHEDULE-STATUS SENT-BY STAY-INFORMED X
+REPLY-URL REQUIRED X
+RESPONSE X
+VOTER CN CUTYPE DELEGATED-FROM DELEGATED-TO DIR LANGUAGE MEMBER ROLE RSVP SCHEDULE-AGENT SCHEDULE-FORCE-SEND SCHEDULE-STATUS SENT-BY STAY-INFORMED X
diff --git a/design-data/properties.csv b/design-data/properties.csv
index c72d2b23..acdd3159 100644
--- a/design-data/properties.csv
+++ b/design-data/properties.csv
@@ -114,10 +114,13 @@
"BUSYTYPE","101","BUSYTYPE","BUSYTYPE"
"#VPOLL Properties","draft-york-vpoll",
"ACCEPT-RESPONSE","102","TEXT,"TEXT"
+"POLL-COMPLETION","110","POLLCOMPLETION,"POLLCOMPLETION"
"POLL-ITEM-ID","103","INTEGER,"INTEGER"
"POLL-MODE","104","POLLMODE,"POLLMODE"
"POLL-PROPERTIES","105","TEXT,"TEXT"
"POLL-WINNER","106","INTEGER,"INTEGER"
+"REPLY-URL","111","URI,"URI"
+"RESPONSE","112","INTEGER,"INTEGER"
"VOTER","107","CAL-ADDRESS,"CAL-ADDRESS"
"#TZdist Properties","draft-ietf-tzdist-service",
"TZID-ALIAS-OF","108","TEXT","TEXT"
diff --git a/design-data/restrictions.csv b/design-data/restrictions.csv
index 7f2c7eec..6f1b4ee2 100644
--- a/design-data/restrictions.csv
+++ b/design-data/restrictions.csv
@@ -1537,17 +1537,18 @@ PUBLISH,VPOLL,DESCRIPTION,NONE,ZEROORONE
PUBLISH,VPOLL,DTEND,NONE,ONEEXCLUSIVE,no_duration
PUBLISH,VPOLL,DURATION,NONE,ONEEXCLUSIVE,no_dtend
PUBLISH,VPOLL,LASTMODIFIED,NONE,ZEROORONE
+PUBLISH,VPOLL,POLLCOMPLETION,NONE,ZEROORONE
PUBLISH,VPOLL,POLLITEMID,NONE,ZERO
PUBLISH,VPOLL,POLLMODE,NONE,ZEROORONE
PUBLISH,VPOLL,POLLPROPERTIES,NONE,ZEROORONE
PUBLISH,VPOLL,PRIORITY,NONE,ZEROORONE
PUBLISH,VPOLL,RELATEDTO,NONE,ZEROPLUS
PUBLISH,VPOLL,RESOURCES,NONE,ZEROPLUS
-PUBLISH,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+PUBLISH,VPOLL,STATUS,NONE,ZEROORONE
PUBLISH,VPOLL,URL,NONE,ZEROORONE
PUBLISH,VPOLL,X,NONE,ZEROPLUS
-PUBLISH,VPOLL,VOTER,NONE,ZERO
PUBLISH,VPOLL,REQUESTSTATUS,NONE,ZERO
+PUBLISH,VPOLL,NONE,VVOTER,ZEROPLUS
PUBLISH,VPOLL,NONE,VALARM,ZEROPLUS
PUBLISH,VPOLL,NONE,VEVENT,ZEROPLUS
PUBLISH,VPOLL,NONE,VFREEBUSY,ZERO
@@ -1557,7 +1558,6 @@ PUBLISH,VPOLL,NONE,VTODO,ZEROPLUS
PUBLISH,VPOLL,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
PUBLISH,VPOLL,NONE,X,ZEROPLUS
REQUEST,VPOLL,NONE,NONE,ONE
-REQUEST,VPOLL,VOTER,NONE,ONEPLUS
REQUEST,VPOLL,DTSTAMP,NONE,ONE
REQUEST,VPOLL,DTSTART,NONE,ZEROORONE
REQUEST,VPOLL,ORGANIZER,NONE,ONE
@@ -1578,6 +1578,7 @@ REQUEST,VPOLL,DURATION,NONE,ONEEXCLUSIVE,no_dtend
REQUEST,VPOLL,GEO,NONE,ZEROORONE
REQUEST,VPOLL,LASTMODIFIED,NONE,ZEROORONE
REQUEST,VPOLL,LOCATION,NONE,ZEROORONE
+REQUEST,VPOLL,POLLCOMPLETION,NONE,ZEROORONE
REQUEST,VPOLL,POLLITEMID,NONE,ZERO
REQUEST,VPOLL,POLLMODE,NONE,ZEROORONE
REQUEST,VPOLL,POLLPROPERTIES,NONE,ZEROORONE
@@ -1585,10 +1586,11 @@ REQUEST,VPOLL,PRIORITY,NONE,ZEROORONE
REQUEST,VPOLL,RELATEDTO,NONE,ZEROPLUS
REQUEST,VPOLL,REQUESTSTATUS,NONE,ZERO
REQUEST,VPOLL,RESOURCES,NONE,ZEROPLUS
-REQUEST,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+REQUEST,VPOLL,STATUS,NONE,ZEROORONE
REQUEST,VPOLL,TRANSP,NONE,ZEROORONE
REQUEST,VPOLL,URL,NONE,ZEROORONE
REQUEST,VPOLL,X,NONE,ZEROPLUS
+REQUEST,VPOLL,NONE,VVOTER,ONEPLUS
REQUEST,VPOLL,NONE,VALARM,ZEROPLUS
REQUEST,VPOLL,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
REQUEST,VPOLL,NONE,X,ZEROPLUS
@@ -1598,7 +1600,6 @@ REQUEST,VPOLL,NONE,VAVAILABILITY,ZERO
REQUEST,VPOLL,NONE,VJOURNAL,ZEROPLUS
REQUEST,VPOLL,NONE,VTODO,ZEROPLUS
REPLY,VPOLL,NONE,NONE,ONEPLUS
-REPLY,VPOLL,VOTER,NONE,ONE
REPLY,VPOLL,DTSTAMP,NONE,ONE
REPLY,VPOLL,ORGANIZER,NONE,ONE
REPLY,VPOLL,UID,NONE,ONE
@@ -1618,6 +1619,7 @@ REPLY,VPOLL,DURATION,NONE,ONEEXCLUSIVE,no_dtend
REPLY,VPOLL,GEO,NONE,ZEROORONE
REPLY,VPOLL,LASTMODIFIED,NONE,ZEROORONE
REPLY,VPOLL,LOCATION,NONE,ZEROORONE
+REPLY,VPOLL,POLLCOMPLETION,NONE,ZERO
REPLY,VPOLL,POLLITEMID,NONE,ONEPLUS
REPLY,VPOLL,POLLMODE,NONE,ZERO
REPLY,VPOLL,POLLPROPERTIES,NONE,ZERO
@@ -1625,11 +1627,12 @@ REPLY,VPOLL,PRIORITY,NONE,ZEROORONE
REPLY,VPOLL,RELATEDTO,NONE,ZEROPLUS
REPLY,VPOLL,RESOURCES,NONE,ZEROPLUS
REPLY,VPOLL,REQUESTSTATUS,NONE,ZEROPLUS
-REPLY,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+REPLY,VPOLL,STATUS,NONE,ZEROORONE
REPLY,VPOLL,SUMMARY,NONE,ZEROORONE
REPLY,VPOLL,TRANSP,NONE,ZEROORONE
REPLY,VPOLL,URL,NONE,ZEROORONE
REPLY,VPOLL,X,NONE,ZEROPLUS
+REPLY,VPOLL,NONE,VVOTER,ONE
REPLY,VPOLL,NONE,VALARM,ZERO
REPLY,VPOLL,NONE,VTIMEZONE,ZEROORONE,must_if_tz_ref
REPLY,VPOLL,NONE,X,ZEROPLUS
@@ -1639,7 +1642,6 @@ REPLY,VPOLL,NONE,VAVAILABILITY,ZERO
REPLY,VPOLL,NONE,VJOURNAL,ZERO
REPLY,VPOLL,NONE,VTODO,ZERO
CANCEL,VPOLL,NONE,NONE,ONEPLUS
-CANCEL,VPOLL,VOTER,NONE,ZEROPLUS
CANCEL,VPOLL,UID,NONE,ONE
CANCEL,VPOLL,DTSTAMP,NONE,ONE
CANCEL,VPOLL,ORGANIZER,NONE,ONE
@@ -1659,18 +1661,20 @@ CANCEL,VPOLL,DURATION,NONE,ONEEXCLUSIVE,no_dtend
CANCEL,VPOLL,GEO,NONE,ZEROORONE
CANCEL,VPOLL,LASTMODIFIED,NONE,ZEROORONE
CANCEL,VPOLL,LOCATION,NONE,ZEROORONE
+CANCEL,VPOLL,POLLCOMPLETION,NONE,ZERO
CANCEL,VPOLL,POLLITEMID,NONE,ZERO
CANCEL,VPOLL,POLLMODE,NONE,ZERO
CANCEL,VPOLL,POLLPROPERTIES,NONE,ZERO
CANCEL,VPOLL,PRIORITY,NONE,ZEROORONE
CANCEL,VPOLL,RELATEDTO,NONE,ZEROPLUS
CANCEL,VPOLL,RESOURCES,NONE,ZEROPLUS
-CANCEL,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+CANCEL,VPOLL,STATUS,NONE,ZEROORONE,must_be_cancel_if_present
CANCEL,VPOLL,SUMMARY,NONE,ONE
CANCEL,VPOLL,TRANSP,NONE,ZEROORONE
CANCEL,VPOLL,URL,NONE,ZEROORONE
CANCEL,VPOLL,X,NONE,ZEROPLUS
CANCEL,VPOLL,REQUESTSTATUS,NONE,ZERO
+CANCEL,VPOLL,NONE,VVOTER,ZEROPLUS
CANCEL,VPOLL,NONE,VALARM,ZERO
CANCEL,VPOLL,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
CANCEL,VPOLL,NONE,X,ZEROPLUS
@@ -1680,7 +1684,6 @@ CANCEL,VPOLL,NONE,VAVAILABILITY,ZERO
CANCEL,VPOLL,NONE,VJOURNAL,ZERO
CANCEL,VPOLL,NONE,VTODO,ZERO
REFRESH,VPOLL,NONE,NONE,ONE
-REFRESH,VPOLL,VOTER,NONE,ONE
REFRESH,VPOLL,DTSTAMP,NONE,ONE
REFRESH,VPOLL,ORGANIZER,NONE,ONE
REFRESH,VPOLL,UID,NONE,ONE
@@ -1700,6 +1703,7 @@ REFRESH,VPOLL,DURATION,NONE,ZERO
REFRESH,VPOLL,GEO,NONE,ZERO
REFRESH,VPOLL,LASTMODIFIED,NONE,ZERO
REFRESH,VPOLL,LOCATION,NONE,ZERO
+REFRESH,VPOLL,POLLCOMPLETION,NONE,ZERO
REFRESH,VPOLL,POLLITEMID,NONE,ZERO
REFRESH,VPOLL,POLLMODE,NONE,ZERO
REFRESH,VPOLL,POLLPROPERTIES,NONE,ZERO
@@ -1711,6 +1715,7 @@ REFRESH,VPOLL,SEQUENCE,NONE,ZERO
REFRESH,VPOLL,STATUS,NONE,ZERO
REFRESH,VPOLL,SUMMARY,NONE,ZERO
REFRESH,VPOLL,URL,NONE,ZERO
+REFRESH,VPOLL,NONE,VVOTER,ONE
REFRESH,VPOLL,NONE,VALARM,ZERO
REFRESH,VPOLL,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
REFRESH,VPOLL,NONE,X,ZEROPLUS
@@ -1725,7 +1730,6 @@ POLLSTATUS,VPOLL,DTSTAMP,NONE,ONE
POLLSTATUS,VPOLL,DTSTART,NONE,ZEROORONE
POLLSTATUS,VPOLL,ORGANIZER,NONE,ONE
POLLSTATUS,VPOLL,SUMMARY,NONE,ONE
-POLLSTATUS,VPOLL,VOTER,NONE,ONEPLUS
POLLSTATUS,VPOLL,UID,NONE,ONE
POLLSTATUS,VPOLL,SEQUENCE,NONE,ZEROORONE
POLLSTATUS,VPOLL,ACCEPTRESPONSE,NONE,ZERO
@@ -1739,16 +1743,18 @@ POLLSTATUS,VPOLL,DESCRIPTION,NONE,ZEROORONE
POLLSTATUS,VPOLL,DTEND,NONE,ONEEXCLUSIVE,no_duration
POLLSTATUS,VPOLL,DURATION,NONE,ONEEXCLUSIVE,no_dtend
POLLSTATUS,VPOLL,LASTMODIFIED,NONE,ZEROORONE
+POLLSTATUS,VPOLL,POLLCOMPLETION,NONE,ZERO
POLLSTATUS,VPOLL,POLLITEMID,NONE,ZERO
POLLSTATUS,VPOLL,POLLMODE,NONE,ZEROORONE
POLLSTATUS,VPOLL,POLLPROPERTIES,NONE,ZERO
POLLSTATUS,VPOLL,PRIORITY,NONE,ZEROORONE
POLLSTATUS,VPOLL,RELATEDTO,NONE,ZEROPLUS
POLLSTATUS,VPOLL,RESOURCES,NONE,ZEROPLUS
-POLLSTATUS,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+POLLSTATUS,VPOLL,STATUS,NONE,ZEROORONE
POLLSTATUS,VPOLL,URL,NONE,ZEROORONE
POLLSTATUS,VPOLL,X,NONE,ZEROPLUS
POLLSTATUS,VPOLL,REQUESTSTATUS,NONE,ZERO
+POLLSTATUS,VPOLL,NONE,VVOTER,ONEPLUS
POLLSTATUS,VPOLL,NONE,VALARM,ZEROPLUS
POLLSTATUS,VPOLL,NONE,VEVENT,ZEROPLUS
POLLSTATUS,VPOLL,NONE,VFREEBUSY,ZERO
@@ -1767,11 +1773,12 @@ NONE,VPOLL,COMPLETED,NONE,ZEROORONE
NONE,VPOLL,DESCRIPTION,NONE,ZEROORONE
NONE,VPOLL,DTSTART,NONE,ZEROORONE
NONE,VPOLL,LASTMODIFIED,NONE,ZEROORONE
+NONE,VPOLL,POLLCOMPLETION,NONE,ZEROORONE
NONE,VPOLL,POLLMODE,NONE,ZEROORONE
NONE,VPOLL,POLLPROPERTIES,NONE,ZEROORONE
NONE,VPOLL,PRIORITY,NONE,ZEROORONE
NONE,VPOLL,SEQUENCE,NONE,ZEROORONE
-NONE,VPOLL,STATUS,NONE,ZEROORONE,may_be_tent_conf
+NONE,VPOLL,STATUS,NONE,ZEROORONE
NONE,VPOLL,SUMMARY,NONE,ZEROORONE
NONE,VPOLL,URL,NONE,ZEROORONE
NONE,VPOLL,DTEND,NONE,ONEEXCLUSIVE,no_duration
@@ -1783,14 +1790,53 @@ NONE,VPOLL,CONTACT,NONE,ZEROPLUS
NONE,VPOLL,REQUESTSTATUS,NONE,ZEROPLUS
NONE,VPOLL,RELATEDTO,NONE,ZEROPLUS
NONE,VPOLL,RESOURCES,NONE,ZEROPLUS
-NONE,VPOLL,VOTER,NONE,ZEROPLUS
NONE,VPOLL,X,NONE,ZEROPLUS
NONE,VPOLL,POLLWINNER,NONE,ZEROORONE
NONE,VPOLL,NONE,VALARM,ZEROPLUS
NONE,VPOLL,NONE,VTIMEZONE,ZEROPLUS,must_if_tz_ref
NONE,VPOLL,NONE,X,ZEROPLUS
-NONE,VPOLL,NONE,VEVENT,ZEROPLUS
+NONE,VPOLL,NONE,VEVENT,ZEROPLUS,
NONE,VPOLL,NONE,VFREEBUSY,ZEROPLUS
NONE,VPOLL,NONE,VAVAILABILITY,ZEROPLUS
NONE,VPOLL,NONE,VJOURNAL,ZEROPLUS
NONE,VPOLL,NONE,VTODO,ZEROPLUS
+NONE,VPOLL,NONE,VVOTER,ZEROPLUS
+NONE,VVOTER,DTSTAMP,NONE,ONE
+NONE,VVOTER,VOTER,NONE,ONE
+NONE,VVOTER,CREATED,NONE,ZEROORONE
+NONE,VVOTER,DESCRIPTION,NONE,ZEROORONE
+NONE,VVOTER,LASTMODIFIED,NONE,ZEROORONE
+NONE,VVOTER,SEQUENCE,NONE,ZEROORONE
+NONE,VVOTER,STATUS,NONE,ZEROORONE
+NONE,VVOTER,SUMMARY,NONE,ZEROORONE
+NONE,VVOTER,URL,NONE,ZEROORONE
+NONE,VVOTER,ATTACH,NONE,ZEROPLUS
+NONE,VVOTER,CATEGORIES,NONE,ZEROPLUS
+NONE,VVOTER,COMMENT,NONE,ZEROPLUS
+NONE,VVOTER,CONTACT,NONE,ZEROPLUS
+NONE,VVOTER,REQUESTSTATUS,NONE,ZEROPLUS
+NONE,VVOTER,RELATEDTO,NONE,ZEROPLUS
+NONE,VVOTER,RESOURCES,NONE,ZEROPLUS
+NONE,VVOTER,X,NONE,ZEROPLUS
+NONE,VVOTER,NONE,VALARM,ZERO
+NONE,VVOTER,NONE,VTIMEZONE,ZERO
+NONE,VVOTER,NONE,VEVENT,ZERO
+NONE,VVOTER,NONE,VFREEBUSY,ZERO
+NONE,VVOTER,NONE,VAVAILABILITY,ZERO
+NONE,VVOTER,NONE,VJOURNAL,ZERO
+NONE,VVOTER,NONE,VTODO,ZERO
+NONE,VVOTER,NONE,XVOTE,ZEROPLUS
+NONE,VVOTER,NONE,X,ZEROPLUS
+NONE,XVOTE,POLLITEMID,NONE,ZEROORONE
+NONE,XVOTE,RESPONSE,NONE,ZEROORONE
+NONE,XVOTE,COMMENT,NONE,ZEROPLUS
+NONE,XVOTE,X,NONE,ZEROPLUS
+NONE,XVOTE,NONE,VALARM,ZEROP
+NONE,XVOTE,NONE,VTIMEZONE,ZERO
+NONE,XVOTE,NONE,VEVENT,ZERO
+NONE,XVOTE,NONE,VFREEBUSY,ZERO
+NONE,XVOTE,NONE,VAVAILABILITY,ZERO
+NONE,XVOTE,NONE,VJOURNAL,ZERO
+NONE,XVOTE,NONE,VTODO,ZERO
+NONE,XVOTE,NONE,VVOTER,ZERO
+NONE,XVOTE,NONE,X,ZEROPLUS
diff --git a/design-data/value-types.csv b/design-data/value-types.csv
index 77676b64..2a382226 100644
--- a/design-data/value-types.csv
+++ b/design-data/value-types.csv
@@ -22,7 +22,7 @@
"METHOD","5030","(a)enum icalproperty_method","string","unitary","X=10030;PUBLISH;REQUEST;REPLY;ADD;CANCEL;REFRESH;COUNTER;DECLINECOUNTER;CREATE;READ;RESPONSE;MOVE;MODIFY;GENERATEUID;DELETE;NONE;POLLSTATUS=10101"
"X-LIC-CLASS","5025","(a)enum icalproperty_xlicclass","string","unitary","X=10067;PUBLISH-NEW;PUBLISH-UPDATE;PUBLISH-FREEBUSY;REQUEST-NEW;REQUEST-UPDATE;REQUEST-RESCHEDULE;REQUEST-DELEGATE;REQUEST-NEW-ORGANIZER;REQUEST-FORWARD;REQUEST-STATUS;REQUEST-FREEBUSY;REPLY-ACCEPT;REPLY-DECLINE;REPLY-DELEGATE;REPLY-CRASHER-ACCEPT;REPLY-CRASHER-DECLINE;ADD-INSTANCE;CANCEL-EVENT;CANCEL-INSTANCE;CANCEL-ALL;REFRESH;COUNTER;DECLINECOUNTER;MALFORMED;OBSOLETE;MISSEQUENCED;UNKNOWN;NONE"
"ACTION","5027","(a)enum icalproperty_action","string","unitary","X=10000;AUDIO;DISPLAY;EMAIL;PROCEDURE;NONE=10005"
-"STATUS","5005","(a)enum icalproperty_status","string","unitary","X=10051;TENTATIVE;CONFIRMED;COMPLETED;NEEDS-ACTION;CANCELLED;IN-PROCESS;DRAFT;FINAL;NONE"
+"STATUS","5005","(a)enum icalproperty_status","string","unitary","X=10051;TENTATIVE;CONFIRMED;COMPLETED;NEEDS-ACTION;CANCELLED;IN-PROCESS;DRAFT;FINAL;NONE;SUBMITTED=10105"
"TRANSP","5006","(a)enum icalproperty_transp","string","unitary","X=10061;OPAQUE;OPAQUE-NOCONFLICT;TRANSPARENT;TRANSPARENT-NOCONFLICT;NONE"
"CLASS","5019","(m)enum icalproperty_class","string","unitary","X=10011;PUBLIC;PRIVATE;CONFIDENTIAL;NONE"
"#Other non-standard",,,,
@@ -40,4 +40,5 @@
"BUSYTYPE","5032","(a)enum icalproperty_busytype","string","unitary","X=10096;BUSY;BUSY-UNAVAILABLE;BUSY-TENTATIVE;NONE"
"#VPOLL types","draft-york-vpoll",,,
"POLLMODE","5033","(a)enum icalproperty_pollmode","string","unitary","X=10102;BASIC;NONE"
+"POLLCOMPLETION","5034","(a)enum icalproperty_pollcompletion","string","unitary","X=10106;SERVER;SERVER-SUBMIT;SERVER-CHOICE;CLIENT;NONE"
"#NOTE for updaters. Preserve the icalvalue_kind Enum values and property Enum values to aid forward compatibility"
diff --git a/src/libical/icalcomponent.c b/src/libical/icalcomponent.c
index 5b0aef07..287c81ca 100644
--- a/src/libical/icalcomponent.c
+++ b/src/libical/icalcomponent.c
@@ -1324,8 +1324,10 @@ static const struct icalcomponent_kind_map component_map[] =
{ ICAL_VAVAILABILITY_COMPONENT, "VAVAILABILITY" },
{ ICAL_XAVAILABLE_COMPONENT, "AVAILABLE" },
- /* Consensus Scheduling component */
+ /* Consensus Scheduling components */
{ ICAL_VPOLL_COMPONENT, "VPOLL" },
+ { ICAL_VVOTER_COMPONENT, "VVOTER" },
+ { ICAL_XVOTE_COMPONENT, "VOTE" },
/* End of list */
{ ICAL_NO_COMPONENT, "" },
@@ -2124,6 +2126,14 @@ icalcomponent* icalcomponent_new_vpoll(void)
{
return icalcomponent_new(ICAL_VPOLL_COMPONENT);
}
+icalcomponent* icalcomponent_new_vvoter(void)
+{
+ return icalcomponent_new(ICAL_VVOTER_COMPONENT);
+}
+icalcomponent* icalcomponent_new_xvote(void)
+{
+ return icalcomponent_new(ICAL_XVOTE_COMPONENT);
+}
/*
* Timezone stuff.
diff --git a/src/libical/icalcomponent.h b/src/libical/icalcomponent.h
index e38840f0..ecefe641 100644
--- a/src/libical/icalcomponent.h
+++ b/src/libical/icalcomponent.h
@@ -284,5 +284,7 @@ icalcomponent* icalcomponent_new_vquery(void);
icalcomponent* icalcomponent_new_vavailability(void);
icalcomponent* icalcomponent_new_xavailable(void);
icalcomponent* icalcomponent_new_vpoll(void);
+icalcomponent* icalcomponent_new_vvoter(void);
+icalcomponent* icalcomponent_new_xvote(void);
#endif /* !ICALCOMPONENT_H */
diff --git a/src/libical/icalenums.h b/src/libical/icalenums.h
index 5b30bd12..432ae130 100644
--- a/src/libical/icalenums.h
+++ b/src/libical/icalenums.h
@@ -65,7 +65,9 @@ typedef enum icalcomponent_kind {
structure of MIME data */
ICAL_VAVAILABILITY_COMPONENT,
ICAL_XAVAILABLE_COMPONENT,
- ICAL_VPOLL_COMPONENT
+ ICAL_VPOLL_COMPONENT,
+ ICAL_VVOTER_COMPONENT,
+ ICAL_XVOTE_COMPONENT
} icalcomponent_kind;
diff --git a/src/libical/icalvalue.c b/src/libical/icalvalue.c
index 6aed2a3f..9234f21a 100644
--- a/src/libical/icalvalue.c
+++ b/src/libical/icalvalue.c
@@ -562,6 +562,9 @@ icalvalue* icalvalue_new_from_string_with_error(icalvalue_kind kind,const char*
case ICAL_POLLMODE_VALUE:
value = icalvalue_new_enum(kind, ICAL_POLLMODE_X,str);
break;
+ case ICAL_POLLCOMPLETION_VALUE:
+ value = icalvalue_new_enum(kind, ICAL_POLLCOMPLETION_X,str);
+ break;
case ICAL_INTEGER_VALUE:
value = icalvalue_new_integer(atoi(str));
@@ -1248,6 +1251,7 @@ icalvalue_as_ical_string_r(const icalvalue* value)
case ICAL_CLASS_VALUE:
case ICAL_BUSYTYPE_VALUE:
case ICAL_POLLMODE_VALUE:
+ case ICAL_POLLCOMPLETION_VALUE:
if(value->x_value !=0){
return icalmemory_strdup(value->x_value);
}