From c36f102568c217c53b87428b765f9ef08a96e021 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 6 Jun 2016 17:35:21 +0200
Subject: [PATCH] Correct enum usages in the libical-glib API definitions

---
 src/libical-glib/api/i-cal-component.xml         | 2 +-
 src/libical-glib/api/i-cal-derived-parameter.xml | 6 +++---
 src/libical-glib/api/i-cal-derived-property.xml  | 6 +++---
 src/libical-glib/api/i-cal-derived-value.xml     | 6 +++---
 src/libical-glib/api/i-cal-error.xml             | 6 +++---
 src/libical-glib/api/i-cal-recurrence-type.xml   | 8 ++++----
 src/libical-glib/api/i-cal-reqstat-type.xml      | 4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/libical-glib/api/i-cal-component.xml b/src/libical-glib/api/i-cal-component.xml
index f1f431a..0803534 100644
--- a/src/libical-glib/api/i-cal-component.xml
+++ b/src/libical-glib/api/i-cal-component.xml
@@ -395,7 +395,7 @@
 	subcomp = i_cal_component_get_first_component (comp, I_CAL_ANY_COMPONENT);
 	while (subcomp) {
 	    i_cal_component_foreach_tzid (subcomp, callback, callback_data);
-	    subcomp = i_cal_component_get_next_component (comp, ICAL_ANY_COMPONENT);
+	    subcomp = i_cal_component_get_next_component (comp, I_CAL_ANY_COMPONENT);
 	}</custom>
     </method>
     <method name="i_cal_component_get_timezone" corresponds="icalcomponent_get_timezone" kind="get" since="1.0">
diff --git a/src/libical-glib/api/i-cal-derived-parameter.xml b/src/libical-glib/api/i-cal-derived-parameter.xml
index c6b2f47..3c516a7 100644
--- a/src/libical-glib/api/i-cal-derived-parameter.xml
+++ b/src/libical-glib/api/i-cal-derived-parameter.xml
@@ -661,18 +661,18 @@
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_new_required" corresponds="icalparameter_new_required" kind="constructor" since="2.0">
-        <parameter type="ICalParameterReltype" name="v" comment="The type of #ICalParameter to be created"/>
+        <parameter type="ICalParameterRequired" name="v" comment="The type of #ICalParameter to be created"/>
         <returns type="ICalParameter *" annotation="transfer full" comment="The newly created #ICalParameter." />
         <comment xml:space="preserve">Create a new #ICalParameter according to the required type</comment>
     </method>
     <method name="i_cal_parameter_get_required" corresponds="icalparameter_get_required" kind="get" since="2.0">
         <parameter type="const ICalParameter *" name="value" comment="The #ICalParameter to be queried"/>
-        <returns type="ICalParameterReltype" comment="The type of the @value" />
+        <returns type="ICalParameterRequired" comment="The type of the @value" />
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_set_required" corresponds="icalparameter_set_required" kind="set" since="2.0">
         <parameter type="ICalParameter *" name="value" comment="The #ICalParameter to be set"/>
-        <parameter type="ICalParameterReltype" name="v" comment="The type of #ICalParameter to be set in the @value"/>
+        <parameter type="ICalParameterRequired" name="v" comment="The type of #ICalParameter to be set in the @value"/>
         <comment xml:space="preserve"></comment>
     </method>
     <method name="i_cal_parameter_new_response" corresponds="icalparameter_new_response" kind="constructor" since="2.0">
diff --git a/src/libical-glib/api/i-cal-derived-property.xml b/src/libical-glib/api/i-cal-derived-property.xml
index 1a64919..2633155 100644
--- a/src/libical-glib/api/i-cal-derived-property.xml
+++ b/src/libical-glib/api/i-cal-derived-property.xml
@@ -1472,18 +1472,18 @@
         <comment>Get the target of #ICalProperty.</comment>
     </method>
     <method name="i_cal_property_new_taskmode" corresponds="icalproperty_new_taskmode" kind="constructor" since="2.0">
-        <parameter type="ICalPropertyAction" name="v" comment="The taskmode."/>
+        <parameter type="ICalPropertyTaskmode" name="v" comment="The taskmode."/>
         <returns type="ICalProperty *" annotation="transfer full" comment="The newly create #ICalProperty"/>
         <comment xml:space="preserve">Create a new #ICalProperty.</comment>
     </method>
     <method name="i_cal_property_set_taskmode" corresponds="icalproperty_set_taskmode" kind="set" since="2.0">
         <parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
-        <parameter type="ICalPropertyAction" name="v" comment="The taskmode."/>
+        <parameter type="ICalPropertyTaskmode" name="v" comment="The taskmode."/>
         <comment>Set the taskmode for the #ICalProperty.</comment>
     </method>
     <method name="i_cal_property_get_taskmode" corresponds="icalproperty_get_taskmode" kind="get" since="2.0">
         <parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
-        <returns type="ICalPropertyAction" comment="Get the taskmode of #ICalProperty."/>
+        <returns type="ICalPropertyTaskmode" comment="Get the taskmode of #ICalProperty."/>
         <comment>Get the taskmode of #ICalProperty.</comment>
     </method>
     <method name="i_cal_property_new_transp" corresponds="icalproperty_new_transp" kind="constructor" since="1.0">
diff --git a/src/libical-glib/api/i-cal-derived-value.xml b/src/libical-glib/api/i-cal-derived-value.xml
index 201ec72..e134500 100644
--- a/src/libical-glib/api/i-cal-derived-value.xml
+++ b/src/libical-glib/api/i-cal-derived-value.xml
@@ -116,7 +116,7 @@
 	    <element name="ICAL_METHOD_DELETE"/>
 	    <element name="ICAL_METHOD_NONE"/>
 	</enum>
-	<enum name="ICalPropertyPollcompletion" native_name="icalproperty_pollcompletion" default_native="ICAL_POLLCOMPLETION_NONE">
+	<enum name="ICalPropertyPollcompletion" native_name="icalproperty_pollcompletion" default_native="I_CAL_POLLCOMPLETION_NONE">
 	    <element name="ICAL_POLLCOMPLETION_X"/>
 	    <element name="ICAL_POLLCOMPLETION_SERVER"/>
 	    <element name="ICAL_POLLCOMPLETION_SERVERSUBMIT"/>
@@ -124,7 +124,7 @@
 	    <element name="ICAL_POLLCOMPLETION_CLIENT"/>
 	    <element name="ICAL_POLLCOMPLETION_NONE"/>
 	</enum>
-	<enum name="ICalPropertyPollmode" native_name="icalproperty_pollmode" default_native="ICAL_POLLMODE_NONE">
+	<enum name="ICalPropertyPollmode" native_name="icalproperty_pollmode" default_native="I_CAL_POLLMODE_NONE">
 	    <element name="ICAL_POLLMODE_X"/>
 	    <element name="ICAL_POLLMODE_BASIC"/>
 	    <element name="ICAL_POLLMODE_NONE"/>
@@ -147,7 +147,7 @@
 	    <element name="ICAL_STATUS_FINAL"/>
 	    <element name="ICAL_STATUS_NONE"/>
 	</enum>
-	<enum name="ICalPropertyTaskmode" native_name="icalproperty_taskmode" default_native="ICAL_TASKMODE_NONE">
+	<enum name="ICalPropertyTaskmode" native_name="icalproperty_taskmode" default_native="I_CAL_TASKMODE_NONE">
 	    <element name="ICAL_TASKMODE_X"/>
 	    <element name="ICAL_TASKMODE_AUTOMATICCOMPLETION"/>
 	    <element name="ICAL_TASKMODE_AUTOMATICFAILURE"/>
diff --git a/src/libical-glib/api/i-cal-error.xml b/src/libical-glib/api/i-cal-error.xml
index 5e3d795..6bc28ea 100644
--- a/src/libical-glib/api/i-cal-error.xml
+++ b/src/libical-glib/api/i-cal-error.xml
@@ -14,7 +14,7 @@
   along with this library. If not, see <http://www.gnu.org/licenses/>.
 -->
 <structure namespace="ICal" name="Error">
-    <enum name="ICalErrorEnum" native_name="icalerrorenum" default_native="ICAL_UNKNOWN_ERROR">
+    <enum name="ICalErrorEnum" native_name="icalerrorenum" default_native="I_CAL_UNKNOWN_ERROR">
         <element name="ICAL_NO_ERROR"/>
         <element name="ICAL_BADARG_ERROR"/>
         <element name="ICAL_NEWFAILED_ERROR"/>
@@ -38,8 +38,8 @@
         <comment xml:space="preserve">Shout out the errors to the compiler</comment>
     </method>
     <method name="i_cal_errno_return" corresponds="icalerrno_return" since="1.0">
-        <returns type="ICalErrorEnum" annotation="transfer full" translator="*" translator_argus="NONE" comment="Return the error happened" />
-        <comment xml:space="preserve">Return the error stored in the library. If no error, return ICAL_NO_ERROR.</comment>
+        <returns type="ICalErrorEnum" annotation="transfer full" translator="(ICalErrorEnum) *" translator_argus="NONE" comment="Return the error happened" />
+        <comment xml:space="preserve">Return the error stored in the library. If no error, return I_CAL_NO_ERROR.</comment>
     </method>
     <method name="i_cal_error_clear_errno" corresponds="icalerror_clear_errno" since="1.0"></method>
     <method name="i_cal_error_strerror" corresponds="icalerror_strerror" since="1.0">
diff --git a/src/libical-glib/api/i-cal-recurrence-type.xml b/src/libical-glib/api/i-cal-recurrence-type.xml
index d3efcfe..6c68ed8 100644
--- a/src/libical-glib/api/i-cal-recurrence-type.xml
+++ b/src/libical-glib/api/i-cal-recurrence-type.xml
@@ -112,14 +112,14 @@
         <returns type="ICalRecurrenceTypeFrequency" comment="The freq of #ICalRecurrenceType."/>
         <comment>Get the freq from #ICalRecurrenceType.</comment>
         <custom>	g_return_val_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur), I_CAL_NO_RECURRENCE);
-	return ((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->freq;</custom>
+	return (ICalRecurrenceTypeFrequency) (((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->freq);</custom>
     </method>
     <method name="i_cal_recurrence_type_set_freq" corresponds="CUSTOM" kind="set" since="1.0">
         <parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
         <parameter type="ICalRecurrenceTypeFrequency" name="freq" comment="The freq of #ICalRecurrenceType."/>
         <comment>Set the freq from #ICalRecurrenceType.</comment>
         <custom>	g_return_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur));
-	((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->freq = freq;</custom>
+	((struct icalrecurrencetype *) i_cal_object_get_native ((ICalObject *)recur))->freq = (icalrecurrencetype_frequency) freq;</custom>
     </method>
     <method name="i_cal_recurrence_type_get_count" corresponds="CUSTOM" kind="get" since="1.0">
         <parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
@@ -154,14 +154,14 @@
         <returns type="ICalRecurrenceTypeWeekday" comment="The week_start of #ICalRecurrenceType."/>
         <comment>Get the week_start from #ICalRecurrenceType.</comment>
         <custom>	g_return_val_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur), I_CAL_NO_WEEKDAY);
-	return ((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->week_start;</custom>
+	return (ICalRecurrenceTypeWeekday) (((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->week_start);</custom>
     </method>
     <method name="i_cal_recurrence_type_set_week_start" corresponds="CUSTOM" kind="set" since="1.0">
         <parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
         <parameter type="ICalRecurrenceTypeWeekday" name="week_start" comment="The week_start of #ICalRecurrenceType."/>
         <comment>Set the week_start from #ICalRecurrenceType.</comment>
         <custom>	g_return_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur));
-	((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->week_start = week_start;</custom>
+	((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->week_start = (icalrecurrencetype_weekday) week_start;</custom>
     </method>
     <method name="i_cal_recurrence_type_get_by_second" corresponds="CUSTOM" kind="get" since="1.0">
         <parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
diff --git a/src/libical-glib/api/i-cal-reqstat-type.xml b/src/libical-glib/api/i-cal-reqstat-type.xml
index b561395..0b99947 100644
--- a/src/libical-glib/api/i-cal-reqstat-type.xml
+++ b/src/libical-glib/api/i-cal-reqstat-type.xml
@@ -36,14 +36,14 @@
         <returns type="ICalRequestStatus" comment="The code of @reqstat."/>
         <comment>Get the code of #ICalReqstatType.</comment>
         <custom>	g_return_val_if_fail (reqstat != NULL &amp;&amp; I_CAL_IS_REQSTAT_TYPE (reqstat), I_CAL_UNKNOWN_STATUS);
-	return ((struct icalreqstattype *)i_cal_object_get_native ((ICalObject *)reqstat))->code;</custom>
+	return (ICalRequestStatus) (((struct icalreqstattype *)i_cal_object_get_native ((ICalObject *)reqstat))->code);</custom>
     </method>
     <method name="i_cal_reqstat_type_set_code" corresponds="CUSTOM" kind="set" since="1.0">
         <parameter type="ICalReqstatType *" name="reqstat" comment="The #ICalReqstatType."/>
         <parameter type="ICalRequestStatus" name="code" comment="The code of @reqstat."/>
         <comment>Set the code of #ICalReqstatType.</comment>
         <custom>	g_return_if_fail (reqstat != NULL &amp;&amp; I_CAL_IS_REQSTAT_TYPE (reqstat));
-	((struct icalreqstattype *)i_cal_object_get_native ((ICalObject *)reqstat))->code = code;</custom>
+	((struct icalreqstattype *)i_cal_object_get_native ((ICalObject *)reqstat))->code = (icalrequeststatus) (code);</custom>
     </method>
     <method name="i_cal_reqstat_type_get_desc" corresponds="CUSTOM" kind="get" since="1.0">
         <parameter type="ICalReqstatType *" name="reqstat" comment="The #ICalReqstatType."/>
-- 
2.7.4