summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/reference/libical-glib/libical-glib-docs.sgml.in7
-rw-r--r--src/libical-glib/CMakeLists.txt1
-rw-r--r--src/libical-glib/api/i-cal-component.xml32
-rw-r--r--src/libical-glib/api/i-cal-datetimeperiod-type.xml12
-rw-r--r--src/libical-glib/api/i-cal-derived-property.xml90
-rw-r--r--src/libical-glib/api/i-cal-derived-value.xml18
-rw-r--r--src/libical-glib/api/i-cal-period-type.xml16
-rw-r--r--src/libical-glib/api/i-cal-recur-iterator.xml6
-rw-r--r--src/libical-glib/api/i-cal-recurrence-type.xml8
-rw-r--r--src/libical-glib/api/i-cal-time-span.xml2
-rw-r--r--src/libical-glib/api/i-cal-time.xml314
-rw-r--r--src/libical-glib/api/i-cal-timetype.xml237
-rw-r--r--src/libical-glib/api/i-cal-timezone-phase.xml12
-rw-r--r--src/libical-glib/api/i-cal-timezone.xml6
-rw-r--r--src/libical-glib/api/i-cal-timezonetype.xml12
-rw-r--r--src/libical-glib/api/i-cal-trigger-type.xml8
-rwxr-xr-xsrc/test/libical-glib/component.py10
-rwxr-xr-xsrc/test/libical-glib/comprehensive.py10
-rwxr-xr-x[-rw-r--r--]src/test/libical-glib/misc.py16
-rwxr-xr-xsrc/test/libical-glib/recurrence-type.py8
-rwxr-xr-xsrc/test/libical-glib/timezone.py44
21 files changed, 415 insertions, 454 deletions
diff --git a/doc/reference/libical-glib/libical-glib-docs.sgml.in b/doc/reference/libical-glib/libical-glib-docs.sgml.in
index b202e198..e7339918 100644
--- a/doc/reference/libical-glib/libical-glib-docs.sgml.in
+++ b/doc/reference/libical-glib/libical-glib-docs.sgml.in
@@ -14,7 +14,7 @@
<chapter>
<title>API Reference</title>
- <xi:include href="xml/i-cal-array.xml"/>
+ <xi:include href="xml/i-cal-array.xml"/>
<xi:include href="xml/i-cal-attach.xml"/>
<xi:include href="xml/i-cal-comp-iter.xml"/>
<xi:include href="xml/i-cal-component.xml"/>
@@ -41,7 +41,6 @@
<xi:include href="xml/i-cal-restriction.xml"/>
<xi:include href="xml/i-cal-time.xml"/>
<xi:include href="xml/i-cal-time-span.xml"/>
- <xi:include href="xml/i-cal-timetype.xml"/>
<xi:include href="xml/i-cal-timezone.xml"/>
<xi:include href="xml/i-cal-timezone-phase.xml"/>
<xi:include href="xml/i-cal-timezonetype.xml"/>
@@ -60,6 +59,10 @@
<title>API Index</title>
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
</index>
+ <index id="api-index-3-0-5" role="3.0.5">
+ <title>Index of new symbols in 3.0.5</title>
+ <xi:include href="xml/api-index-3.0.5.xml"><xi:fallback /></xi:include>
+ </index>
<index id="api-index-3-0" role="3.0">
<title>Index of new symbols in 3.0</title>
<xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt
index ea043d25..e446ee81 100644
--- a/src/libical-glib/CMakeLists.txt
+++ b/src/libical-glib/CMakeLists.txt
@@ -37,7 +37,6 @@ list(APPEND API_FILES
api/i-cal-reqstat-type.xml
api/i-cal-restriction.xml
api/i-cal-time-span.xml
- api/i-cal-timetype.xml
api/i-cal-time.xml
api/i-cal-timezone-phase.xml
api/i-cal-timezonetype.xml
diff --git a/src/libical-glib/api/i-cal-component.xml b/src/libical-glib/api/i-cal-component.xml
index 0fb9f5a0..0e96d8bc 100644
--- a/src/libical-glib/api/i-cal-component.xml
+++ b/src/libical-glib/api/i-cal-component.xml
@@ -246,32 +246,32 @@
</method>
<method name="i_cal_component_set_dtstart" corresponds="icalcomponent_set_dtstart" kind="set" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="v" comment="A #ICalTimetype."/>
+ <parameter type="ICalTime *" name="v" comment="A #ICalTime."/>
<comment xml:space="preserve">Set the dtstart of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_get_dtstart" corresponds="icalcomponent_get_dtstart" kind="get" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="A #ICalTimetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="A #ICalTime."/>
<comment xml:space="preserve">Get the dtstart of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_set_dtend" corresponds="icalcomponent_set_dtend" kind="set" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="v" comment="A #ICalTimetype."/>
+ <parameter type="ICalTime *" name="v" comment="A #ICalTime."/>
<comment xml:space="preserve">Set the dtend of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_get_dtend" corresponds="icalcomponent_get_dtend" kind="get" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="A #ICalTimetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="A #ICalTime."/>
<comment xml:space="preserve">Get the dtend of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_set_due" corresponds="icalcomponent_set_due" kind="set" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="v" comment="A #ICalTimetype."/>
+ <parameter type="ICalTime *" name="v" comment="A #ICalTime."/>
<comment xml:space="preserve">Set the due of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_get_due" corresponds="icalcomponent_get_due" kind="get" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="A #ICalTimetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="A #ICalTime."/>
<comment xml:space="preserve">Get the due of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_set_duration" corresponds="icalcomponent_set_duration" kind="set" since="1.0">
@@ -296,12 +296,12 @@
</method>
<method name="i_cal_component_set_dtstamp" corresponds="icalcomponent_set_dtstamp" kind="set" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="v" comment="A #ICalTimetype."/>
+ <parameter type="ICalTime *" name="v" comment="A #ICalTime."/>
<comment xml:space="preserve">Set the dtstamp of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_get_dtstamp" corresponds="icalcomponent_get_dtstamp" kind="get" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="A #ICalTimetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="A #ICalTime."/>
<comment xml:space="preserve">Get the dtstamp of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_set_summary" corresponds="icalcomponent_set_summary" kind="set" since="1.0">
@@ -346,12 +346,12 @@
</method>
<method name="i_cal_component_set_recurrenceid" corresponds="icalcomponent_set_recurrenceid" kind="set" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="v" comment="A #ICalTimetype."/>
+ <parameter type="ICalTime *" name="v" comment="A #ICalTime."/>
<comment xml:space="preserve">Set the recurrenceid of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_get_recurrenceid" corresponds="icalcomponent_get_recurrenceid" kind="get" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="A #ICalTimetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="A #ICalTime."/>
<comment xml:space="preserve">Get the recurrenceid of the #ICalComponent.</comment>
</method>
<method name="i_cal_component_set_description" corresponds="icalcomponent_set_description" kind="set" since="1.0">
@@ -455,8 +455,8 @@ static void foreach_recurrence_cb(icalcomponent *in_comp, struct icaltime_span *
}</declaration>
<method name="i_cal_component_foreach_recurrence" corresponds="CUSTOM" kind="other" since="3.0.5">
<parameter type="ICalComponent *" name="comp" comment="The #ICalComponent to be queried."/>
- <parameter type="ICalTimetype *" name="start" comment="Ignore timespans before this"/>
- <parameter type="ICalTimetype *" name="end" comment="Ignore timespans after this"/>
+ <parameter type="ICalTime *" name="start" comment="Ignore timespans before this"/>
+ <parameter type="ICalTime *" name="end" comment="Ignore timespans after this"/>
<parameter type="ICalComponentForeachRecurrenceFunc" name="callback" annotation="scope call" comment="Function called for each timespan within the range."/>
<parameter type="gpointer" name="user_data" annotation="nullable, closure callback" comment="The user data for callback function"/>
<comment>Cycle through all recurrances of an event. This function will call the specified callback function for once for the base value of DTSTART, and foreach recurring date/time value. It will filter out events that are specified as an EXDATE or an EXRULE.</comment>
@@ -465,8 +465,8 @@ static void foreach_recurrence_cb(icalcomponent *in_comp, struct icaltime_span *
struct icaltimetype *native_start, *native_end;
g_return_if_fail (I_CAL_IS_COMPONENT (comp));
- g_return_if_fail (I_CAL_IS_TIMETYPE (start));
- g_return_if_fail (I_CAL_IS_TIMETYPE (end));
+ g_return_if_fail (I_CAL_IS_TIME(start));
+ g_return_if_fail (I_CAL_IS_TIME(end));
g_return_if_fail (callback != NULL);
native_comp = i_cal_object_get_native((ICalObject *) comp);
@@ -490,8 +490,8 @@ static void foreach_recurrence_cb(icalcomponent *in_comp, struct icaltime_span *
</method>
<method name="i_cal_property_recurrence_is_excluded" corresponds="icalproperty_recurrence_is_excluded" since="1.0">
<parameter type="ICalComponent *" name="comp" comment="A #ICalComponent."/>
- <parameter type="ICalTimetype *" name="dtstart" native_op="POINTER" comment="The base dtstart value for this component."/>
- <parameter type="ICalTimetype *" name="recurtime" native_op="POINTER" comment="The time to test against."/>
+ <parameter type="ICalTime *" name="dtstart" native_op="POINTER" comment="The base dtstart value for this component."/>
+ <parameter type="ICalTime *" name="recurtime" native_op="POINTER" comment="The time to test against."/>
<returns type="gint" comment="1 if yes, 0 if not."/>
<comment xml:space="preserve">Decide if this recurrance is acceptable. This function decides if a specific recurrence value is excluded by EXRULE or EXDATE properties.</comment>
</method>
diff --git a/src/libical-glib/api/i-cal-datetimeperiod-type.xml b/src/libical-glib/api/i-cal-datetimeperiod-type.xml
index c3e32258..9d786836 100644
--- a/src/libical-glib/api/i-cal-datetimeperiod-type.xml
+++ b/src/libical-glib/api/i-cal-datetimeperiod-type.xml
@@ -13,12 +13,12 @@
You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
-->
-<structure namespace="ICal" name="DatetimeperiodType" native="struct icaldatetimeperiodtype" is_bare="true" default_native="i_cal_datetimeperiod_type_new_default ()" includes="libical-glib/i-cal-timetype.h, libical-glib/i-cal-period-type.h">
+<structure namespace="ICal" name="DatetimeperiodType" native="struct icaldatetimeperiodtype" is_bare="true" default_native="i_cal_datetimeperiod_type_new_default ()" includes="libical-glib/i-cal-time.h, libical-glib/i-cal-period-type.h">
<method name="i_cal_datetimeperiod_type_new_default" corresponds="CUSTOM" annotation="skip" kind="private" since="1.0">
<returns type="struct icaldatetimeperiodtype" annotation="transfer full" comment="The newly created #ICalDatetimeperiodType" />
<comment xml:space="preserve">Create a new default #ICalDatetimeperiodType</comment>
<custom> struct icaldatetimeperiodtype datetimeperiodtype;
- datetimeperiodtype.time = i_cal_timetype_new_default ();
+ datetimeperiodtype.time = icaltime_null_time ();
datetimeperiodtype.period = icalperiodtype_null_period ();
return datetimeperiodtype;</custom>
</method>
@@ -29,17 +29,17 @@
</method>
<method name="i_cal_datetimeperiod_type_get_time" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalDatetimeperiodType *" name="dtp" comment="The #ICalDatetimeperiodType to be queried"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The time attribute of @dtp."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The time attribute of @dtp."/>
<comment>Get the time attribute of #ICalDatetimeperiodType.</comment>
<custom> g_return_val_if_fail (dtp != NULL &amp;&amp; I_CAL_IS_DATETIMEPERIOD_TYPE (dtp), NULL);
- return i_cal_timetype_new_full (((struct icaldatetimeperiodtype *)i_cal_object_get_native ((ICalObject *)dtp))->time);</custom>
+ return i_cal_time_new_full (((struct icaldatetimeperiodtype *)i_cal_object_get_native ((ICalObject *)dtp))->time);</custom>
</method>
<method name="i_cal_datetimeperiod_type_set_time" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalDatetimeperiodType *" name="dtp" comment="The #ICalDatetimeperiodType to be set"/>
- <parameter type="ICalTimetype *" name="time" comment="The time attribute of @dtp."/>
+ <parameter type="ICalTime *" name="time" comment="The time attribute of @dtp."/>
<comment>Set the time attribute of #ICalDatetimeperiodType.</comment>
<custom> g_return_if_fail (dtp != NULL &amp;&amp; I_CAL_IS_DATETIMEPERIOD_TYPE (dtp));
- g_return_if_fail (time != NULL &amp;&amp; I_CAL_IS_TIMETYPE (time));
+ g_return_if_fail (time != NULL &amp;&amp; I_CAL_IS_TIME(time));
((struct icaldatetimeperiodtype *)i_cal_object_get_native ((ICalObject *)dtp))->time = *(struct icaltimetype *)i_cal_object_get_native ((ICalObject *)time);</custom>
</method>
<method name="i_cal_datetimeperiod_type_get_period" corresponds="CUSTOM" kind="get" since="1.0">
diff --git a/src/libical-glib/api/i-cal-derived-property.xml b/src/libical-glib/api/i-cal-derived-property.xml
index aba38159..e1980e32 100644
--- a/src/libical-glib/api/i-cal-derived-property.xml
+++ b/src/libical-glib/api/i-cal-derived-property.xml
@@ -148,18 +148,18 @@
<comment>Get the acceptresponse of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_acknowledged" corresponds="icalproperty_new_acknowledged" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of acknowledgement."/>
+ <parameter type="ICalTime *" name="v" comment="The time of acknowledgement."/>
<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_acknowledged" corresponds="icalproperty_set_acknowledged" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The acknowledgement time."/>
+ <parameter type="ICalTime *" name="v" comment="The acknowledgement time."/>
<comment>Set the acknowledged time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_acknowledged" corresponds="icalproperty_get_acknowledged" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the acknowledged time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the acknowledged time of #ICalProperty."/>
<comment>Get the acknowledged time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_action" corresponds="icalproperty_new_action" kind="constructor" since="1.0">
@@ -407,18 +407,18 @@
<comment>Get the comment of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_completed" corresponds="icalproperty_new_completed" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of completed."/>
+ <parameter type="ICalTime *" name="v" comment="The time of completed."/>
<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_completed" corresponds="icalproperty_set_completed" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The completed time."/>
+ <parameter type="ICalTime *" name="v" comment="The completed time."/>
<comment>Set the completed time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_completed" corresponds="icalproperty_get_completed" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the completed time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the completed time of #ICalProperty."/>
<comment>Get the completed time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_components" corresponds="icalproperty_new_components" kind="constructor" since="1.0">
@@ -452,18 +452,18 @@
<comment>Get the contact of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_created" corresponds="icalproperty_new_created" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of created."/>
+ <parameter type="ICalTime *" name="v" comment="The time of created."/>
<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_created" corresponds="icalproperty_set_created" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The created time."/>
+ <parameter type="ICalTime *" name="v" comment="The created time."/>
<comment>Set the created time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_created" corresponds="icalproperty_get_created" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the created time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the created time of #ICalProperty."/>
<comment>Get the created time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_csid" corresponds="icalproperty_new_csid" kind="constructor" since="1.0">
@@ -482,33 +482,33 @@
<comment>Get the csid of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_datemax" corresponds="icalproperty_new_datemax" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of datemax."/>
+ <parameter type="ICalTime *" name="v" comment="The time of datemax."/>
<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_datemax" corresponds="icalproperty_set_datemax" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The datemax time."/>
+ <parameter type="ICalTime *" name="v" comment="The datemax time."/>
<comment>Set the datemax time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_datemax" corresponds="icalproperty_get_datemax" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the datemax time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the datemax time of #ICalProperty."/>
<comment>Get the datemax time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_datemin" corresponds="icalproperty_new_datemin" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of datemin."/>
+ <parameter type="ICalTime *" name="v" comment="The time of datemin."/>
<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_datemin" corresponds="icalproperty_set_datemin" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The datemin time."/>
+ <parameter type="ICalTime *" name="v" comment="The datemin time."/>
<comment>Set the datemin time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_datemin" corresponds="icalproperty_get_datemin" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the datemin time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the datemin time of #ICalProperty."/>
<comment>Get the datemin time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_decreed" corresponds="icalproperty_new_decreed" kind="constructor" since="1.0">
@@ -617,63 +617,63 @@
<comment>Get the description of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_dtend" corresponds="icalproperty_new_dtend" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of dtend."/>
+ <parameter type="ICalTime *" name="v" comment="The time of dtend."/>
<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_dtend" corresponds="icalproperty_set_dtend" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The dtend time."/>
+ <parameter type="ICalTime *" name="v" comment="The dtend time."/>
<comment>Set the dtend time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_dtend" corresponds="icalproperty_get_dtend" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the dtend time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the dtend time of #ICalProperty."/>
<comment>Get the dtend time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_dtstamp" corresponds="icalproperty_new_dtstamp" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of dtstamp."/>
+ <parameter type="ICalTime *" name="v" comment="The time of dtstamp."/>
<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_dtstamp" corresponds="icalproperty_set_dtstamp" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The dtstamp time."/>
+ <parameter type="ICalTime *" name="v" comment="The dtstamp time."/>
<comment>Set the dtstamp time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_dtstamp" corresponds="icalproperty_get_dtstamp" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the dtstamp time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the dtstamp time of #ICalProperty."/>
<comment>Get the dtstamp time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_dtstart" corresponds="icalproperty_new_dtstart" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of dtstart."/>
+ <parameter type="ICalTime *" name="v" comment="The time of dtstart."/>
<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_dtstart" corresponds="icalproperty_set_dtstart" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The dtstart time."/>
+ <parameter type="ICalTime *" name="v" comment="The dtstart time."/>
<comment>Set the dtstart time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_dtstart" corresponds="icalproperty_get_dtstart" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the dtstart time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the dtstart time of #ICalProperty."/>
<comment>Get the dtstart time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_due" corresponds="icalproperty_new_due" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of due."/>
+ <parameter type="ICalTime *" name="v" comment="The time of due."/>
<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_due" corresponds="icalproperty_set_due" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The due time."/>
+ <parameter type="ICalTime *" name="v" comment="The due time."/>
<comment>Set the due time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_due" corresponds="icalproperty_get_due" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the due time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the due time of #ICalProperty."/>
<comment>Get the due time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_duration" corresponds="icalproperty_new_duration" kind="constructor" since="1.0">
@@ -707,18 +707,18 @@
<comment>Get the estimatedduration of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_exdate" corresponds="icalproperty_new_exdate" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of exdate."/>
+ <parameter type="ICalTime *" name="v" comment="The time of exdate."/>
<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_exdate" corresponds="icalproperty_set_exdate" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The exdate time."/>
+ <parameter type="ICalTime *" name="v" comment="The exdate time."/>
<comment>Set the exdate time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_exdate" corresponds="icalproperty_get_exdate" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the exdate time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the exdate time of #ICalProperty."/>
<comment>Get the exdate time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_expand" corresponds="icalproperty_new_expand" kind="constructor" since="1.0">
@@ -812,18 +812,18 @@
<comment>Get the itipversion of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_lastmodified" corresponds="icalproperty_new_lastmodified" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of lastmodified."/>
+ <parameter type="ICalTime *" name="v" comment="The time of lastmodified."/>
<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_lastmodified" corresponds="icalproperty_set_lastmodified" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The lastmodified time."/>
+ <parameter type="ICalTime *" name="v" comment="The lastmodified time."/>
<comment>Set the lastmodified time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_lastmodified" corresponds="icalproperty_get_lastmodified" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the lastmodified time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the lastmodified time of #ICalProperty."/>
<comment>Get the lastmodified time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_location" corresponds="icalproperty_new_location" kind="constructor" since="1.0">
@@ -857,18 +857,18 @@
<comment>Get the maxcomponentsize of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_maxdate" corresponds="icalproperty_new_maxdate" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of maxdate."/>
+ <parameter type="ICalTime *" name="v" comment="The time of maxdate."/>
<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_maxdate" corresponds="icalproperty_set_maxdate" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The maxdate time."/>
+ <parameter type="ICalTime *" name="v" comment="The maxdate time."/>
<comment>Set the maxdate time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_maxdate" corresponds="icalproperty_get_maxdate" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the maxdate time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the maxdate time of #ICalProperty."/>
<comment>Get the maxdate time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_maxresults" corresponds="icalproperty_new_maxresults" kind="constructor" since="1.0">
@@ -917,18 +917,18 @@
<comment>Get the method of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_mindate" corresponds="icalproperty_new_mindate" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of mindate."/>
+ <parameter type="ICalTime *" name="v" comment="The time of mindate."/>
<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_mindate" corresponds="icalproperty_set_mindate" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The mindate time."/>
+ <parameter type="ICalTime *" name="v" comment="The mindate time."/>
<comment>Set the mindate time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_mindate" corresponds="icalproperty_get_mindate" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the mindate time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the mindate time of #ICalProperty."/>
<comment>Get the mindate time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_multipart" corresponds="icalproperty_new_multipart" kind="constructor" since="1.0">
@@ -1247,18 +1247,18 @@
<comment>Get the recurlimit of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_recurrenceid" corresponds="icalproperty_new_recurrenceid" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of recurrenceid."/>
+ <parameter type="ICalTime *" name="v" comment="The time of recurrenceid."/>
<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_recurrenceid" corresponds="icalproperty_set_recurrenceid" kind="set" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The recurrenceid time."/>
+ <parameter type="ICalTime *" name="v" comment="The recurrenceid time."/>
<comment>Set the recurrenceid time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_recurrenceid" corresponds="icalproperty_get_recurrenceid" kind="get" since="1.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the recurrenceid time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the recurrenceid time of #ICalProperty."/>
<comment>Get the recurrenceid time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_relatedto" corresponds="icalproperty_new_relatedto" kind="constructor" since="1.0">
@@ -1607,18 +1607,18 @@
<comment>Get the tzoffsetto of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_tzuntil" corresponds="icalproperty_new_tzuntil" kind="constructor" since="2.0">
- <parameter type="ICalTimetype *" name="v" comment="The time of acknowledgement."/>
+ <parameter type="ICalTime *" name="v" comment="The time of acknowledgement."/>
<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_tzuntil" corresponds="icalproperty_set_tzuntil" kind="set" since="2.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be set"/>
- <parameter type="ICalTimetype *" name="v" comment="The acknowledgement time."/>
+ <parameter type="ICalTime *" name="v" comment="The acknowledgement time."/>
<comment>Set the tzuntil time for the #ICalProperty.</comment>
</method>
<method name="i_cal_property_get_tzuntil" corresponds="icalproperty_get_tzuntil" kind="get" since="2.0">
<parameter type="ICalProperty *" name="prop" comment="The #ICalProperty to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="Get the tzuntil time of #ICalProperty."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="Get the tzuntil time of #ICalProperty."/>
<comment>Get the tzuntil time of #ICalProperty.</comment>
</method>
<method name="i_cal_property_new_tzurl" corresponds="icalproperty_new_tzurl" 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 65eff6da..6e742b33 100644
--- a/src/libical-glib/api/i-cal-derived-value.xml
+++ b/src/libical-glib/api/i-cal-derived-value.xml
@@ -245,32 +245,32 @@
</method>
<method name="i_cal_value_set_datetime" corresponds="icalvalue_set_datetime" kind="set" since="1.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue."/>
- <parameter type="ICalTimetype *" name="v" comment="The datetime value."/>
+ <parameter type="ICalTime *" name="v" comment="The datetime value."/>
<comment>Set the datetime in the #ICalValue.</comment>
</method>
<method name="i_cal_value_new_datetime" corresponds="icalvalue_new_datetime" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The datetime value"/>
+ <parameter type="ICalTime *" name="v" comment="The datetime value"/>
<returns type="ICalValue *" annotation="transfer full" comment="The newly create #ICalValue."/>
<comment>Create a new #ICalValue with the type datetime.</comment>
</method>
<method name="i_cal_value_get_datetime" corresponds="icalvalue_get_datetime" kind="get" since="1.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried."/>
- <returns type="ICalTimetype *" annotation="allow-none, transfer full" comment="The datetime within #ICalValue"/>
+ <returns type="ICalTime *" annotation="allow-none, transfer full" comment="The datetime within #ICalValue"/>
<comment>Get the datetime of #ICalValue.</comment>
</method>
<method name="i_cal_value_set_datetimedate" corresponds="icalvalue_set_datetimedate" kind="set" since="3.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue."/>
- <parameter type="ICalTimetype *" name="v" comment="The datetimedate (DATE-TIME or DATE) value."/>
+ <parameter type="ICalTime *" name="v" comment="The datetimedate (DATE-TIME or DATE) value."/>
<comment>Set the datetimedate (DATE-TIME or DATE) in the #ICalValue.</comment>
</method>
<method name="i_cal_value_new_datetimedate" corresponds="icalvalue_new_datetimedate" kind="constructor" since="3.0">
- <parameter type="ICalTimetype *" name="v" comment="The DATE-TIME or DATE value"/>
+ <parameter type="ICalTime *" name="v" comment="The DATE-TIME or DATE value"/>
<returns type="ICalValue *" annotation="transfer full" comment="The newly create #ICalValue."/>
<comment>Create a new #ICalValue with the type datetimedate (DATE-TIME or DATE).</comment>
</method>
<method name="i_cal_value_get_datetimedate" corresponds="icalvalue_get_datetimedate" kind="get" since="3.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried."/>
- <returns type="ICalTimetype *" annotation="allow-none, transfer full" comment="The datetimedate within #ICalValue"/>
+ <returns type="ICalTime *" annotation="allow-none, transfer full" comment="The datetimedate within #ICalValue"/>
<comment>Get the datetimedate (DATE-TIME or DATE) of #ICalValue.</comment>
</method>
<method name="i_cal_value_set_datetimeperiod" corresponds="icalvalue_set_datetimeperiod" kind="set" since="1.0">
@@ -654,17 +654,17 @@
</method>
<method name="i_cal_value_set_date" corresponds="icalvalue_set_date" kind="set" since="1.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue."/>
- <parameter type="ICalTimetype *" name="v" comment="The date value."/>
+ <parameter type="ICalTime *" name="v" comment="The date value."/>
<comment>Set the date in the #ICalValue.</comment>
</method>
<method name="i_cal_value_new_date" corresponds="icalvalue_new_date" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="v" comment="The date value"/>
+ <parameter type="ICalTime *" name="v" comment="The date value"/>
<returns type="ICalValue *" annotation="transfer full" comment="The newly create #ICalValue."/>
<comment>Create a new #ICalValue with the type date.</comment>
</method>
<method name="i_cal_value_get_date" corresponds="icalvalue_get_date" kind="get" since="1.0">
<parameter type="ICalValue *" name="value" comment="The #ICalValue to be queried."/>
- <returns type="ICalTimetype *" annotation="allow-none, transfer full" comment="The date within #ICalValue"/>
+ <returns type="ICalTime *" annotation="allow-none, transfer full" comment="The date within #ICalValue"/>
<comment>Get the date of #ICalValue.</comment>
</method>
<method name="i_cal_value_set_action" corresponds="icalvalue_set_action" kind="set" since="1.0">
diff --git a/src/libical-glib/api/i-cal-period-type.xml b/src/libical-glib/api/i-cal-period-type.xml
index 71fad4a1..fa882e62 100644
--- a/src/libical-glib/api/i-cal-period-type.xml
+++ b/src/libical-glib/api/i-cal-period-type.xml
@@ -16,44 +16,44 @@
<structure namespace="ICal" name="PeriodType" native="struct icalperiodtype" is_bare="true" default_native="icalperiodtype_null_period ()">
<method name="i_cal_period_type_get_start" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalPeriodType *" name="period" comment="The #ICalPeriodType to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The start of @period."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The start of @period."/>
<comment>Get the start time from an #ICalPeriodType.</comment>
<custom> g_return_val_if_fail (period != NULL, NULL);
g_return_val_if_fail (I_CAL_IS_PERIOD_TYPE (period), NULL);
- return i_cal_timetype_new_full ((* (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period)).start);</custom>
+ return i_cal_time_new_full ((* (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period)).start);</custom>
</method>
<method name="i_cal_period_type_set_start" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalPeriodType *" name="period" comment="The #ICalPeriodType to be set."/>
- <parameter type="ICalTimetype *" name="start" comment="The start of @period."/>
+ <parameter type="ICalTime *" name="start" comment="The start of @period."/>
<comment>Set the start time of an #ICalPeriodType.</comment>
<custom> struct icalperiodtype *periodtype;
g_return_if_fail (period != NULL);
g_return_if_fail (I_CAL_IS_PERIOD_TYPE (period));
g_return_if_fail (start != NULL);
- g_return_if_fail (I_CAL_IS_TIMETYPE (start));
+ g_return_if_fail (I_CAL_IS_TIME(start));
periodtype = (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period);
periodtype->start = * (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)start);</custom>
</method>
<method name="i_cal_period_type_get_end" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalPeriodType *" name="period" comment="The #ICalPeriodType to be queried."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The end of @period."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The end of @period."/>
<comment>Get the end time from an #ICalPeriodType.</comment>
<custom> g_return_val_if_fail (period != NULL, NULL);
g_return_val_if_fail (I_CAL_IS_PERIOD_TYPE (period), NULL);
- return i_cal_timetype_new_full ((* (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period)).end);</custom>
+ return i_cal_time_new_full ((* (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period)).end);</custom>
</method>
<method name="i_cal_period_type_set_end" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalPeriodType *" name="period" comment="The #ICalPeriodType to be set."/>
- <parameter type="ICalTimetype *" name="end" comment="The end of @period."/>
+ <parameter type="ICalTime *" name="end" comment="The end of @period."/>
<comment>Set the end time of an #ICalPeriodType.</comment>
<custom> struct icalperiodtype *periodtype;
g_return_if_fail (period != NULL);
g_return_if_fail (I_CAL_IS_PERIOD_TYPE (period));
g_return_if_fail (end != NULL);
- g_return_if_fail (I_CAL_IS_TIMETYPE (end));
+ g_return_if_fail (I_CAL_IS_TIME(end));
periodtype = (struct icalperiodtype *)i_cal_object_get_native ((ICalObject *)period);
periodtype->end = (* (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)end));</custom>
diff --git a/src/libical-glib/api/i-cal-recur-iterator.xml b/src/libical-glib/api/i-cal-recur-iterator.xml
index 049ec613..81f1c6f9 100644
--- a/src/libical-glib/api/i-cal-recur-iterator.xml
+++ b/src/libical-glib/api/i-cal-recur-iterator.xml
@@ -16,18 +16,18 @@
<structure namespace="ICal" name="RecurIterator" native="icalrecur_iterator" destroy_func="icalrecur_iterator_free">
<method name="i_cal_recur_iterator_new" corresponds="icalrecur_iterator_new" kind="constructor" since="1.0">
<parameter type="ICalRecurrenceType *" name="rule" comment="The rule applied on the #ICalRecurIterator."/>
- <parameter type="ICalTimetype *" name="dtstart" comment="The start time of the recurrence."/>
+ <parameter type="ICalTime *" name="dtstart" comment="The start time of the recurrence."/>
<returns type="ICalRecurIterator *" annotation="transfer full" comment="The newly created #ICalRecurIterator"/>
<comment xml:space="preserve">Create an #ICalRecurIterator.</comment>
</method>
<method name="i_cal_recur_iterator_next" corresponds="icalrecur_iterator_next" since="1.0">
<parameter type="ICalRecurIterator *" name="iterator" comment="The iterator."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The next occurrence according to this recurrence rule."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The next occurrence according to this recurrence rule."/>
<comment xml:space="preserve">Get the next occurrence from an iterator.</comment>
</method>
<method name="i_cal_recur_iterator_set_start" corresponds="icalrecur_iterator_set_start" since="3.0">
<parameter type="ICalRecurIterator *" name="iterator" comment="The iterator."/>
- <parameter type="ICalTimetype *" name="start" comment="The date-time to move the iterator to."/>
+ <parameter type="ICalTime *" name="start" comment="The date-time to move the iterator to."/>
<returns type="gint" comment="1 if succeeded, 0 if failed, like when the recurrence type is unsupported."/>
<comment xml:space="preserve">Set the date-time at which the iterator will start, where 'start' is a value between DTSTART and UNTIL.
Note: CAN NOT be used with RRULEs that contain COUNT.</comment>
diff --git a/src/libical-glib/api/i-cal-recurrence-type.xml b/src/libical-glib/api/i-cal-recurrence-type.xml
index 8cb5b69c..98d41be7 100644
--- a/src/libical-glib/api/i-cal-recurrence-type.xml
+++ b/src/libical-glib/api/i-cal-recurrence-type.xml
@@ -127,17 +127,17 @@
</method>
<method name="i_cal_recurrence_type_get_until" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The until of #ICalRecurrenceType."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The until of #ICalRecurrenceType."/>
<comment>Get the until from #ICalRecurrenceType.</comment>
<custom> g_return_val_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur), NULL);
- return i_cal_timetype_new_full (((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->until);</custom>
+ return i_cal_time_new_full (((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->until);</custom>
</method>
<method name="i_cal_recurrence_type_set_until" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalRecurrenceType *" name="recur" comment="The #ICalRecurrenceType."/>
- <parameter type="ICalTimetype *" name="until" comment="The until of #ICalRecurrenceType."/>
+ <parameter type="ICalTime *" name="until" comment="The until of #ICalRecurrenceType."/>
<comment>Set the until from #ICalRecurrenceType.</comment>
<custom> g_return_if_fail (recur != NULL &amp;&amp; I_CAL_IS_RECURRENCE_TYPE (recur));
- g_return_if_fail (until != NULL &amp;&amp; I_CAL_IS_TIMETYPE (until));
+ g_return_if_fail (until != NULL &amp;&amp; I_CAL_IS_TIME(until));
((struct icalrecurrencetype *)i_cal_object_get_native ((ICalObject *)recur))->until = *(icaltimetype *)i_cal_object_get_native ((ICalObject *)until);</custom>
</method>
<method name="i_cal_recurrence_type_get_freq" corresponds="CUSTOM" kind="get" since="1.0">
diff --git a/src/libical-glib/api/i-cal-time-span.xml b/src/libical-glib/api/i-cal-time-span.xml
index 51f59d82..b2164c50 100644
--- a/src/libical-glib/api/i-cal-time-span.xml
+++ b/src/libical-glib/api/i-cal-time-span.xml
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
-->
-<structure namespace="ICal" name="TimeSpan" native="struct icaltime_span" is_bare="true" default_native="icaltime_span_new (i_cal_timetype_new_default (), i_cal_timetype_new_default (), 0)" includes="libical-glib/i-cal-timetype.h">
+<structure namespace="ICal" name="TimeSpan" native="struct icaltime_span" is_bare="true" default_native="icaltime_span_new(icaltime_null_time(), icaltime_null_time(), 0)" includes="libical-glib/i-cal-time.h">
<method name="i_cal_time_span_new_timet" corresponds="CUSTOM" kind="constructor" since="3.0.5">
<parameter type="time_t" name="start" comment="Start of the time span."/>
<parameter type="time_t" name="end" comment="End of the time span."/>
diff --git a/src/libical-glib/api/i-cal-time.xml b/src/libical-glib/api/i-cal-time.xml
index 7ee5ac62..9eadb60d 100644
--- a/src/libical-glib/api/i-cal-time.xml
+++ b/src/libical-glib/api/i-cal-time.xml
@@ -13,136 +13,153 @@
You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
-->
-<structure namespace="ICal" name="Time">
+<structure namespace="ICal" name="Time" native="struct icaltimetype" is_bare="true" default_native="icaltime_null_time()">
+ <method name="i_cal_time_new" corresponds="CUSTOM" kind="constructor" since="1.0">
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime. It is a null time" />
+ <comment xml:space="preserve">Create a new #ICalTime.</comment>
+ <custom> return i_cal_time_new_full(icaltime_null_time());</custom>
+ </method>
+ <method name="i_cal_time_new_clone" corresponds="CUSTOM" kind="constructor" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to clone."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime, copy of @timetype." />
+ <comment xml:space="preserve">Create a new #ICalTime, copy of @timetype.</comment>
+ <custom> struct icaltimetype *itt;
+
+ g_return_val_if_fail(I_CAL_IS_TIME(timetype), NULL);
+
+ itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
+ g_return_val_if_fail(itt != NULL, NULL);
+
+ return i_cal_time_new_full(*itt);</custom>
+ </method>
<method name="i_cal_time_null_time" corresponds="icaltime_null_time" kind="constructor" since="1.0">
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
<comment xml:space="preserve">Create a default time which is an epoch time</comment>
</method>
<method name="i_cal_time_null_date" corresponds="icaltime_null_date" kind="constructor" since="1.0">
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
<comment xml:space="preserve">Create a null date, which indicates no time has been set</comment>
</method>
<method name="i_cal_time_current_time_with_zone" corresponds="icaltime_current_time_with_zone" kind="others" since="1.0">
- <parameter type="ICalTimezone *" name="zone" annotation="in, transfer none" comment="The timezone used to create a #ICalTimetype according to the current time"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
- <comment xml:space="preserve">Create a #ICalTimetype according to the timezone and current time</comment>
+ <parameter type="ICalTimezone *" name="zone" annotation="in, transfer none" comment="The timezone used to create a #ICalTime according to the current time"/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
+ <comment xml:space="preserve">Create a #ICalTime according to the timezone and current time</comment>
</method>
<method name="i_cal_time_today" corresponds="icaltime_today" kind="others" since="1.0">
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
- <comment xml:space="preserve">Create a #ICalTimetype representing today</comment>
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
+ <comment xml:space="preserve">Create a #ICalTime representing today</comment>
</method>
<method name="i_cal_time_from_timet_with_zone" corresponds="icaltime_from_timet_with_zone" kind="others" since="1.0">
<parameter type="const time_t" name="v" comment="The seconds past since epoch time"/>
<parameter type="gint" name="is_date" comment="Whether it is a date type, 1 if yes, 0 if not."/>
<parameter type="ICalTimezone *" name="zone" annotation="nullable" comment="The timezone, or %NULL"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
<comment xml:space="preserve">Convert seconds past UNIX epoch to a timetype, using timezones.</comment>
</method>
<method name="i_cal_time_from_string" corresponds="icaltime_from_string" kind="others" since="1.0">
<parameter type="const gchar *" name="str" comment="The ISO format string"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
<comment xml:space="preserve">create a time from an ISO format string</comment>
</method>
<method name="i_cal_time_from_day_of_year" corresponds="icaltime_from_day_of_year" kind="constructor" since="1.0">
<parameter type="const gint" name="day" comment="The day of a year"/>
<parameter type="const gint" name="year" comment="The year"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype" />
+ <returns type="ICalTime *" annotation="transfer full" comment="The newly created #ICalTime" />
<comment xml:space="preserve">Create a new time, given a day of year and a year.</comment>
</method>
<method name="i_cal_time_as_timet" corresponds="icaltime_as_timet" since="1.0">
- <parameter type="ICalTimetype *" name="tt" comment="The #ICalTimetype to be converted"/>
+ <parameter type="const ICalTime *" name="tt" comment="The #ICalTime to be converted"/>
<returns type="time_t" comment="the time as seconds past the UNIX epoch" />
<comment xml:space="preserve">Return the time as seconds past the UNIX epoch</comment>
</method>
<method name="i_cal_time_as_timet_with_zone" corresponds="icaltime_as_timet_with_zone" since="1.0">
- <parameter type="ICalTimetype *" name="tt" comment="The #ICalTimetype to be converted"/>
- <parameter type="ICalTimezone *" name="zone" annotation="in, transfer none, nullable" comment="The timezone"/>
+ <parameter type="const ICalTime *" name="tt" comment="The #ICalTime to be converted"/>
+ <parameter type="const ICalTimezone *" name="zone" annotation="in, transfer none, nullable" comment="The timezone"/>
<returns type="time_t" comment="the time as seconds past the UNIX epoch" />
<comment xml:space="preserve">Return the time as seconds past the UNIX epoch, using timezones.</comment>
</method>
<method name="i_cal_time_as_ical_string_r" corresponds="icaltime_as_ical_string_r" since="1.0">
- <parameter type="ICalTimetype *" name="tt" comment="The #ICalTimetype to be converted"/>
+ <parameter type="const ICalTime *" name="tt" comment="The #ICalTime to be converted"/>
<returns type="gchar *" annotation="transfer full" comment="The string representation" />
<comment xml:space="preserve">Return a string represention of the time, in RFC2445 format.</comment>
</method>
<method name="i_cal_time_get_timezone" corresponds="(void *)icaltime_get_timezone" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
<returns type="ICalTimezone *" annotation="transfer none" translator_argus="(GObject *)tt, TRUE" comment="The timezone information" />
<comment xml:space="preserve">Return the timezone</comment>
</method>
<method name="i_cal_time_set_timezone" corresponds="icaltime_set_timezone" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="tt" native_op="POINTER" comment="The #ICalTimetype to be queried"/>
- <parameter type="ICalTimezone *" name="zone" annotation="transfer full" comment="The timezone"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The #ICalTimetype after being set" />
- <comment xml:space="preserve">Set the timezone</comment>
+ <parameter type="ICalTime *" name="tt" native_op="POINTER" comment="The #ICalTime"/>
+ <parameter type="const ICalTimezone *" name="zone" annotation="transfer none, nullable" comment="The timezone"/>
+ <comment xml:space="preserve">Set the timezone of the @tt</comment>
</method>
<method name="i_cal_time_get_tzid" corresponds="icaltime_get_tzid" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
- <returns type="const gchar *" annotation="allow-none, transfer none" comment="The tzid of #ICalTimetype, or NULL if floating type" />
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
+ <returns type="const gchar *" annotation="allow-none, transfer none" comment="The tzid of #ICalTime, or NULL if floating type" />
<comment xml:space="preserve">Return the tzid, or NULL for a floating time</comment>
</method>
<method name="i_cal_time_day_of_year" corresponds="icaltime_day_of_year" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
<returns type="gint" comment="the day of the year of the given time" />
<comment xml:space="preserve">Return the day of the year of the given time</comment>
</method>
<method name="i_cal_time_day_of_week" corresponds="icaltime_day_of_week" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
<returns type="gint" comment="the day of the week of the given time. Sunday is 1." />
<comment xml:space="preserve">Return the day of the week of the given time. Sunday is 1</comment>
</method>
<method name="i_cal_time_start_doy_week" corresponds="icaltime_start_doy_week" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
<parameter type="gint" name="fdow" comment="The first day of the week" />
<returns type="gint" comment="the day of the year for the Sunday of the week that the given time is within." />
<comment xml:space="preserve">Return the day of the year for the first day of the week that the given time is within.</comment>
</method>
<method name="i_cal_time_week_number" corresponds="icaltime_week_number" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be queried"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be queried"/>
<returns type="gint" comment="the week number for the week the given time is within." />
<comment xml:space="preserve">Return the week number for the week the given time is within.</comment>
</method>
<method name="i_cal_time_is_null_time" corresponds="icaltime_is_null_time" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be checked"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be checked"/>
<returns type="gint" comment="Whether @tt is null_time. 1 if yes, 0 if not." />
<comment xml:space="preserve">Return true of the time is null.</comment>
</method>
<method name="i_cal_time_is_valid_time" corresponds="icaltime_is_valid_time" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be checked"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be checked"/>
<returns type="gint" comment="Whether @tt is null_time. 1 if yes, 0 if not." />
<comment xml:space="preserve">Return true of the time is null.</comment>
</method>
<method name="i_cal_time_is_date" corresponds="icaltime_is_date" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be checked"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be checked"/>
<returns type="gint" comment="true if time is of DATE type, false if DATE-TIME." />
<comment xml:space="preserve">Returns true if time is of DATE type, false if DATE-TIME.</comment>
</method>
<method name="i_cal_time_is_utc" corresponds="icaltime_is_utc" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be checked"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be checked"/>
<returns type="gint" comment="true if time is relative to UTC zone." />
<comment xml:space="preserve">Returns true if time is relative to UTC zone.</comment>
</method>
<method name="i_cal_time_compare" corresponds="icaltime_compare" since="1.0">
- <parameter type="ICalTimetype *" name="a" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
- <parameter type="ICalTimetype *" name="b" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
+ <parameter type="const ICalTime *" name="a" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
+ <parameter type="const ICalTime *" name="b" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
<returns type="gint" comment="-1, 0, or 1 to indicate that a less than b, a==b or a larger than b." />
<comment xml:space="preserve">Return -1, 0, or 1 to indicate that a less than b, a==b or a larger than b.</comment>
</method>
<method name="i_cal_time_compare_date_only" corresponds="icaltime_compare_date_only" since="1.0">
- <parameter type="ICalTimetype *" name="a" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
- <parameter type="ICalTimetype *" name="b" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
+ <parameter type="const ICalTime *" name="a" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
+ <parameter type="const ICalTime *" name="b" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
<returns type="gint" comment="-1, 0, or 1 to indicate that a less than b, a==b or a larger than b." />
<comment xml:space="preserve">like icaltime_compare, but only use the date parts.</comment>
</method>
<method name="i_cal_time_compare_date_only_tz" corresponds="icaltime_compare_date_only_tz" since="1.0">
- <parameter type="ICalTimetype *" name="a" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
- <parameter type="ICalTimetype *" name="b" annotation="in, transfer none" comment="The #ICalTimetype to be compared"/>
+ <parameter type="const ICalTime *" name="a" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
+ <parameter type="const ICalTime *" name="b" annotation="in, transfer none" comment="The #ICalTime to be compared"/>
<parameter type="ICalTimezone *" name="zone" annotation="transfer full" comment="The target timezone"/>
<returns type="gint" comment="-1, 0, or 1 to indicate that a less than b, a==b or a larger than b." />
<comment xml:space="preserve">like icaltime_compare_tz, but only use the date parts.</comment>
</method>
<method name="i_cal_time_adjust" corresponds="icaltime_adjust" since="1.0">
- <parameter type="ICalTimetype *" name="tt" native_op="POINTER" comment="The #ICalTimetype to be set"/>
+ <parameter type="ICalTime *" name="tt" native_op="POINTER" comment="The #ICalTime to be set"/>
<parameter type="const gint" name="days" comment="difference of days adjusted"/>
<parameter type="const gint" name="hours" comment="difference of hours adjusted"/>
<parameter type="const gint" name="minutes" comment="difference of minutes adjusted"/>
@@ -150,50 +167,62 @@
<comment xml:space="preserve">like icaltime_compare_tz, but only use the date parts.</comment>
</method>
<method name="i_cal_time_normalize" corresponds="icaltime_normalize" since="1.0">
- <parameter type="ICalTimetype *" name="t" annotation="in, transfer none" comment="The #ICalTimetype to be normalized"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The #ICalTimetype normalized"/>
+ <parameter type="const ICalTime *" name="t" annotation="in, transfer none" comment="The #ICalTime to be normalized"/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The #ICalTime normalized"/>
<comment xml:space="preserve">Normalize the icaltime, so that all fields are within the normal range.</comment>
</method>
+ <method name="i_cal_time_normalize_inplace" corresponds="CUSTOM" since="3.0.5">
+ <parameter type="ICalTime *" name="tt" comment="The #ICalTime to be normalized"/>
+ <comment xml:space="preserve">Normalize the @tt, so that all fields are within the normal range.</comment>
+ <custom xml:space="preserve"> icaltimetype *itt;
+
+ g_return_if_fail(I_CAL_IS_TIME (tt));
+
+ itt = i_cal_object_get_native(I_CAL_OBJECT (tt));
+ g_return_if_fail (itt != NULL);
+
+ *itt = icaltime_normalize(*itt);</custom>
+ </method>
<method name="i_cal_time_convert_to_zone" corresponds="icaltime_convert_to_zone" since="1.0">
- <parameter type="ICalTimetype *" name="tt" annotation="in, transfer none" comment="The #ICalTimetype to be converted"/>
+ <parameter type="const ICalTime *" name="tt" annotation="in, transfer none" comment="The #ICalTime to be converted"/>
<parameter type="ICalTimezone *" name="zone" annotation="transfer none, nullable" comment="The target timezone"/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The converted #ICalTimetype" />
- <comment xml:space="preserve">Convert @tt to @zone and return new %ICalTimetype object.</comment>
+ <returns type="ICalTime *" annotation="transfer full" comment="The converted #ICalTime" />
+ <comment xml:space="preserve">Convert @tt to @zone and return new %ICalTime object.</comment>
</method>
<method name="i_cal_time_convert_to_zone_inplace" corresponds="CUSTOM" since="3.0.5">
- <parameter type="ICalTimetype *" name="tt" comment="The #ICalTimetype to be converted"/>
+ <parameter type="ICalTime *" name="tt" comment="The #ICalTime to be converted"/>
<parameter type="ICalTimezone *" name="zone" annotation="transfer none, nullable" comment="The target timezone"/>
<comment xml:space="preserve">Convert @tt to @zone and store the result into @tt.</comment>
<custom xml:space="preserve"> icaltimetype *itt;
- g_return_if_fail (I_CAL_IS_TIMETYPE (tt));
+ g_return_if_fail(I_CAL_IS_TIME(tt));
if(zone)
- g_return_if_fail (I_CAL_IS_TIMEZONE (zone));
+ g_return_if_fail(I_CAL_IS_TIMEZONE(zone));
- itt = i_cal_object_get_native (I_CAL_OBJECT (tt));
- g_return_if_fail (itt != NULL);
+ itt = i_cal_object_get_native(I_CAL_OBJECT(tt));
+ g_return_if_fail(itt != NULL);
- *itt = icaltime_convert_to_zone (*itt, ((zone)?((icaltimezone *)i_cal_object_get_native (I_CAL_OBJECT (zone))):NULL));</custom>
+ *itt = icaltime_convert_to_zone(*itt, ((zone)?((icaltimezone *)i_cal_object_get_native (I_CAL_OBJECT (zone))):NULL));</custom>
</method>
<method name="i_cal_time_days_in_month" corresponds="icaltime_days_in_month" since="1.0">
- <parameter type="const gint" name="month" comment="The target month"/>
- <parameter type="const gint" name="year" comment="The target year"/>
+ <parameter type="gint" name="month" comment="The target month"/>
+ <parameter type="gint" name="year" comment="The target year"/>
<returns type="gint" comment="The number of days in the target month in the target year." />
<comment xml:space="preserve">Get the number of days in the target month in the target year.</comment>
</method>
<method name="i_cal_time_days_is_leap_year" corresponds="icaltime_is_leap_year" since="1.0">
- <parameter type="const gint" name="year" comment="The target year"/>
+ <parameter type="gint" name="year" comment="The target year"/>
<returns type="gint" comment="1 if @year is leap year, 0 if not." />
<comment xml:space="preserve">Check whether a year is a leap year.</comment>
</method>
<method name="i_cal_time_days_in_year" corresponds="icaltime_days_in_year" since="2.0">
- <parameter type="const gint" name="year" comment="The target year"/>
+ <parameter type="gint" name="year" comment="The target year"/>
<returns type="gint" comment="Days in this year." />
<comment xml:space="preserve">Return the number of days in this year.</comment>
</method>
<method name="i_cal_time_span_new" corresponds="icaltime_span_new" kind="constructor" since="1.0">
- <parameter type="ICalTimetype *" name="dtstart" comment="The start of #ICalTimeSpan"/>
- <parameter type="ICalTimetype *" name="dtend" comment="The end of #ICalTimeSpan"/>
+ <parameter type="ICalTime *" name="dtstart" comment="The start of #ICalTimeSpan"/>
+ <parameter type="ICalTime *" name="dtend" comment="The end of #ICalTimeSpan"/>
<parameter type="gint" name="is_busy" comment="Whether this span is busy"/>
<returns type="ICalTimeSpan *" annotation="transfer full" comment="The newly create #ICalTimeSpan"/>
<comment xml:space="preserve">Create a new #ICalTimeSpan.</comment>
@@ -211,15 +240,182 @@
<comment xml:space="preserve">Check whether one #ICalTimeSpan is contained in another #ICalTimeSpan.</comment>
</method>
<method name="i_cal_time_add" corresponds="icaltime_add" kind="other" since="2.0">
- <parameter type="ICalTimetype *" name="t" comment="A #ICalTimetype to be operated on."/>
+ <parameter type="ICalTime *" name="t" comment="A #ICalTime to be operated on."/>
<parameter type="ICalDurationType *" name="d" comment="A #ICalDuarationType as the difference."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The #ICalTimetype results. The native object is the same. But since it is a bare object, so it won't cause segmentation."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The #ICalTime results. The native object is the same. But since it is a bare object, so it won't cause segmentation."/>
<comment xml:space="preserve">Add a time duration on the time.</comment>
</method>
<method name="i_cal_time_subtract" corresponds="icaltime_subtract" kind="other" since="2.0">
- <parameter type="ICalTimetype *" name="t1" comment="The subtracted #ICalTimetype."/>
- <parameter type="ICalTimetype *" name="t2" comment="The subtracting #ICalTimetype."/>
- <returns type="ICalDurationType *" annotation="transfer full" comment="The #ICalDuarationType between two #ICalTimetype."/>
+ <parameter type="ICalTime *" name="t1" comment="The subtracted #ICalTime."/>
+ <parameter type="ICalTime *" name="t2" comment="The subtracting #ICalTime."/>
+ <returns type="ICalDurationType *" annotation="transfer full" comment="The #ICalDuarationType between two #ICalTime."/>
<comment xml:space="preserve">Get the duration between two time.</comment>
</method>
+ <method name="i_cal_time_get_year" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The year."/>
+ <comment xml:space="preserve">Get the year of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->year;</custom>
+ </method>
+ <method name="i_cal_time_set_year" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="year" comment="The year."/>
+ <comment>Set the year of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->year = year;</custom>
+ </method>
+ <method name="i_cal_time_get_month" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The month." />
+ <comment xml:space="preserve">Get the month of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->month;</custom>
+ </method>
+ <method name="i_cal_time_set_month" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="month" comment="The month."/>
+ <comment>Set the month of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->month = month;</custom>
+ </method>
+ <method name="i_cal_time_get_day" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The day." />
+ <comment xml:space="preserve">Get the day of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->day;</custom>
+ </method>
+ <method name="i_cal_time_set_day" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="day" comment="The day."/>
+ <comment>Set the day of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->day = day;</custom>
+ </method>
+ <method name="i_cal_time_get_hour" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The hour." />
+ <comment xml:space="preserve">Get the hour of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->hour;</custom>
+ </method>
+ <method name="i_cal_time_set_hour" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="hour" comment="The hour."/>
+ <comment>Set the hour of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->hour = hour;</custom>
+ </method>
+ <method name="i_cal_time_get_minute" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The minute." />
+ <comment xml:space="preserve">Get the minute of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->minute;</custom>
+ </method>
+ <method name="i_cal_time_set_minute" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="minute" comment="The minute."/>
+ <comment>Set the minute of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->minute = minute;</custom>
+ </method>
+ <method name="i_cal_time_get_second" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The second." />
+ <comment xml:space="preserve">Get the second of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->second;</custom>
+ </method>
+ <method name="i_cal_time_set_second" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="second" comment="The second."/>
+ <comment>Set the second of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->second = second;</custom>
+ </method>
+ <method name="i_cal_time_set_is_date" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="is_date" comment="The is_date."/>
+ <comment>Set the is_date of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_date = is_date;</custom>
+ </method>
+ <method name="i_cal_time_is_daylight" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <returns type="gint" comment="The is_daylight." />
+ <comment xml:space="preserve">Get the is_daylight of #ICalTime.</comment>
+ <custom> g_return_val_if_fail (timetype != NULL, 0);
+ return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_daylight;</custom>
+ </method>
+ <method name="i_cal_time_set_is_daylight" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set."/>
+ <parameter type="gint" name="is_daylight" comment="The is_daylight."/>
+ <comment>Set the is_daylight of #ICalTime.</comment>
+ <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIME(timetype));
+ ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_daylight = is_daylight;</custom>
+ </method>
+ <method name="i_cal_time_get_date" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <parameter type="gint *" name="out_year" annotation="out caller-allocates" comment="Out parameter for the 'year' part of the date."/>
+ <parameter type="gint *" name="out_month" annotation="out caller-allocates" comment="Out parameter for the 'month' part of the date."/>
+ <parameter type="gint *" name="out_day" annotation="out caller-allocates" comment="Out parameter for the 'day' part of the date."/>
+ <comment xml:space="preserve">Get the year/month/date parts of the @timetype in one call.</comment>
+ <custom> icaltimetype *itt;
+ g_return_if_fail(timetype != NULL);
+ itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
+ g_return_if_fail(itt != NULL);
+ if(out_year)
+ *out_year = itt->year;
+ if(out_month)
+ *out_month = itt->month;
+ if(out_day)
+ *out_day = itt->day; </custom>
+ </method>
+ <method name="i_cal_time_set_date" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set to."/>
+ <parameter type="gint" name="year" comment="The 'year' part of the date." />
+ <parameter type="gint" name="month" comment="The 'month' part of the date." />
+ <parameter type="gint" name="day" comment="The 'day' part of the date." />
+ <comment xml:space="preserve">Set the year/month/date parts of the @timetype in one call. This doesn't verify validity of the given date.</comment>
+ <custom> icaltimetype *itt;
+ g_return_if_fail(timetype != NULL);
+ itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
+ g_return_if_fail(itt != NULL);
+ itt->year = year;
+ itt->month = month;
+ itt->day = day; </custom>
+ </method>
+ <method name="i_cal_time_get_time" corresponds="CUSTOM" kind="get" since="1.0">
+ <parameter type="const ICalTime *" name="timetype" comment="The #ICalTime to be queried."/>
+ <parameter type="gint *" name="out_hour" annotation="out caller-allocates" comment="Out parameter for the 'hour' part of the time."/>
+ <parameter type="gint *" name="out_minute" annotation="out caller-allocates" comment="Out parameter for the 'minute' part of the time."/>
+ <parameter type="gint *" name="out_second" annotation="out caller-allocates" comment="Out parameter for the 'second' part of the time."/>
+ <comment xml:space="preserve">Get the hour/minute/second parts of the @timetype in one call.</comment>
+ <custom> icaltimetype *itt;
+ g_return_if_fail(timetype != NULL);
+ itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
+ g_return_if_fail(itt != NULL);
+ if(out_hour)
+ *out_hour = itt->hour;
+ if(out_minute)
+ *out_minute = itt->minute;
+ if(out_second)
+ *out_second = itt->second; </custom>
+ </method>
+ <method name="i_cal_time_set_time" corresponds="CUSTOM" kind="set" since="1.0">
+ <parameter type="ICalTime *" name="timetype" comment="The #ICalTime to be set to."/>
+ <parameter type="gint" name="hour" comment="The 'hour' part of the time." />
+ <parameter type="gint" name="minute" comment="The 'minute' part of the time." />
+ <parameter type="gint" name="second" comment="The 'second' part of the time." />
+ <comment xml:space="preserve">Set the hour/minute/second parts of the @timetype in one call. This doesn't verify validity of the given time.</comment>
+ <custom> icaltimetype *itt;
+ g_return_if_fail(timetype != NULL);
+ itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
+ g_return_if_fail(itt != NULL);
+ itt->hour = hour;
+ itt->minute = minute;
+ itt->second = second; </custom>
+ </method>
</structure>
diff --git a/src/libical-glib/api/i-cal-timetype.xml b/src/libical-glib/api/i-cal-timetype.xml
deleted file mode 100644
index ea156ff1..00000000
--- a/src/libical-glib/api/i-cal-timetype.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<!--
- Copyright (C) 2015 William Yu <williamyu@gnome.org>
-
- This library is free software: you can redistribute it and/or modify it
- under the terms of version 2.1. of the GNU Lesser General Public License
- as published by the Free Software Foundation.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library. If not, see <http://www.gnu.org/licenses/>.
--->
-<structure namespace="ICal" name="Timetype" native="struct icaltimetype" is_bare="true" default_native="i_cal_timetype_new_default ()">
- <method name="i_cal_timetype_new_default" corresponds="CUSTOM" annotation="skip" kind="private" since="1.0">
- <returns type="struct icaltimetype" comment="The newly created #ICalTimetype. It is a null time" />
- <comment xml:space="preserve">Create a new #ICalTimetype.</comment>
- <custom> return icaltime_null_time();</custom>
- </method>
- <method name="i_cal_timetype_new" corresponds="CUSTOM" kind="constructor" since="1.0">
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype. It is a null time" />
- <comment xml:space="preserve">Create a new #ICalTimetype.</comment>
- <custom> return i_cal_timetype_new_full (i_cal_timetype_new_default());</custom>
- </method>
- <method name="i_cal_timetype_new_clone" corresponds="CUSTOM" kind="constructor" since="1.0">
- <parameter type="const ICalTimetype *" name="timetype" comment="The #ICalTimetype to clone."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The newly created #ICalTimetype, copy of @timetype." />
- <comment xml:space="preserve">Create a new #ICalTimetype, copy of @timetype.</comment>
- <custom> struct icaltimetype *itt;
-
- g_return_val_if_fail(I_CAL_IS_TIMETYPE(timetype), NULL);
-
- itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
- g_return_val_if_fail(itt != NULL, NULL);
-
- return i_cal_timetype_new_full(*itt);</custom>
- </method>
- <method name="i_cal_timetype_get_year" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The year."/>
- <comment xml:space="preserve">Get the year of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->year;</custom>
- </method>
- <method name="i_cal_timetype_set_year" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="year" comment="The year."/>
- <comment>Set the year of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->year = year;</custom>
- </method>
- <method name="i_cal_timetype_get_month" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The month." />
- <comment xml:space="preserve">Get the month of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->month;</custom>
- </method>
- <method name="i_cal_timetype_set_month" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="month" comment="The month."/>
- <comment>Set the month of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->month = month;</custom>
- </method>
- <method name="i_cal_timetype_get_day" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The day." />
- <comment xml:space="preserve">Get the day of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->day;</custom>
- </method>
- <method name="i_cal_timetype_set_day" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="day" comment="The day."/>
- <comment>Set the day of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->day = day;</custom>
- </method>
- <method name="i_cal_timetype_get_hour" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The hour." />
- <comment xml:space="preserve">Get the hour of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->hour;</custom>
- </method>
- <method name="i_cal_timetype_set_hour" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="hour" comment="The hour."/>
- <comment>Set the hour of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->hour = hour;</custom>
- </method>
- <method name="i_cal_timetype_get_minute" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The minute." />
- <comment xml:space="preserve">Get the minute of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->minute;</custom>
- </method>
- <method name="i_cal_timetype_set_minute" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="minute" comment="The minute."/>
- <comment>Set the minute of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->minute = minute;</custom>
- </method>
- <method name="i_cal_timetype_get_second" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The second." />
- <comment xml:space="preserve">Get the second of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->second;</custom>
- </method>
- <method name="i_cal_timetype_set_second" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="second" comment="The second."/>
- <comment>Set the second of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->second = second;</custom>
- </method>
- <method name="i_cal_timetype_get_is_date" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The is_date." />
- <comment xml:space="preserve">Get the is_date of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_date;</custom>
- </method>
- <method name="i_cal_timetype_set_is_date" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="is_date" comment="The is_date."/>
- <comment>Set the is_date of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_date = is_date;</custom>
- </method>
- <method name="i_cal_timetype_get_is_daylight" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="The is_daylight." />
- <comment xml:space="preserve">Get the is_daylight of #ICalTimetype.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_daylight;</custom>
- </method>
- <method name="i_cal_timetype_set_is_daylight" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set."/>
- <parameter type="gint" name="is_daylight" comment="The is_daylight."/>
- <comment>Set the is_daylight of #ICalTimetype.</comment>
- <custom> g_return_if_fail (timetype != NULL &amp;&amp; I_CAL_IS_TIMETYPE (timetype));
- ((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->is_daylight = is_daylight;</custom>
- </method>
- <method name="i_cal_timetype_get_zone" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="ICalTimezone *" annotation="transfer none, nullable" comment="The set timezone." />
- <comment xml:space="preserve">Get the timezone of the #ICalTimetype. Returns %NULL when none is set.</comment>
- <custom> icaltimezone *zone;
- g_return_val_if_fail (timetype != NULL, NULL);
- zone = (icaltimezone *)(((struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype))->zone);
- return zone ? i_cal_timezone_new_full (zone, NULL, TRUE) : NULL;</custom>
- </method>
- <method name="i_cal_timetype_set_zone" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set to."/>
- <parameter type="const ICalTimezone *" name="zone" annotation="transfer none, nullable" comment="The timezone." />
- <comment xml:space="preserve">Set the timezone of the #ICalTimetype. It can be %NULL to unset it. The passed-in @zone object should stay alaive for the whole life time of the @timetype, because the @timetype doesn't reference it.</comment>
- <custom> g_return_if_fail (timetype != NULL);
- ((struct icaltimetype *)i_cal_object_get_native((ICalObject *)timetype))->zone = zone ? i_cal_object_get_native((ICalObject *)zone) : NULL;</custom>
- </method>
- <method name="i_cal_timetype_is_utc" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <returns type="gint" comment="If the time is in UTC." />
- <comment xml:space="preserve">Get if the #ICalTimetype is in UTC.</comment>
- <custom> g_return_val_if_fail (timetype != NULL, 0);
- return icaltime_is_utc(*(struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype));</custom>
- </method>
- <method name="i_cal_timetype_get_date" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <parameter type="gint *" name="out_year" annotation="out caller-allocates" comment="Out parameter for the 'year' part of the date."/>
- <parameter type="gint *" name="out_month" annotation="out caller-allocates" comment="Out parameter for the 'month' part of the date."/>
- <parameter type="gint *" name="out_day" annotation="out caller-allocates" comment="Out parameter for the 'day' part of the date."/>
- <comment xml:space="preserve">Get the year/month/date parts of the @timetype in one call.</comment>
- <custom> icaltimetype *itt;
- g_return_if_fail(timetype != NULL);
- itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
- g_return_if_fail(itt != NULL);
- if(out_year)
- *out_year = itt->year;
- if(out_month)
- *out_month = itt->month;
- if(out_day)
- *out_day = itt->day; </custom>
- </method>
- <method name="i_cal_timetype_set_date" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set to."/>
- <parameter type="gint" name="year" comment="The 'year' part of the date." />
- <parameter type="gint" name="month" comment="The 'month' part of the date." />
- <parameter type="gint" name="day" comment="The 'day' part of the date." />
- <comment xml:space="preserve">Set the year/month/date parts of the @timetype in one call. This doesn't verify validity of the given date.</comment>
- <custom> icaltimetype *itt;
- g_return_if_fail(timetype != NULL);
- itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
- g_return_if_fail(itt != NULL);
- itt->year = year;
- itt->month = month;
- itt->day = day; </custom>
- </method>
- <method name="i_cal_timetype_get_time" corresponds="CUSTOM" kind="get" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be queried."/>
- <parameter type="gint *" name="out_hour" annotation="out caller-allocates" comment="Out parameter for the 'hour' part of the time."/>
- <parameter type="gint *" name="out_minute" annotation="out caller-allocates" comment="Out parameter for the 'minute' part of the time."/>
- <parameter type="gint *" name="out_second" annotation="out caller-allocates" comment="Out parameter for the 'second' part of the time."/>
- <comment xml:space="preserve">Get the hour/minute/second parts of the @timetype in one call.</comment>
- <custom> icaltimetype *itt;
- g_return_if_fail(timetype != NULL);
- itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
- g_return_if_fail(itt != NULL);
- if(out_hour)
- *out_hour = itt->hour;
- if(out_minute)
- *out_minute = itt->minute;
- if(out_second)
- *out_second = itt->second; </custom>
- </method>
- <method name="i_cal_timetype_set_time" corresponds="CUSTOM" kind="set" since="1.0">
- <parameter type="ICalTimetype *" name="timetype" comment="The #ICalTimetype to be set to."/>
- <parameter type="gint" name="hour" comment="The 'hour' part of the time." />
- <parameter type="gint" name="minute" comment="The 'minute' part of the time." />
- <parameter type="gint" name="second" comment="The 'second' part of the time." />
- <comment xml:space="preserve">Set the hour/minute/second parts of the @timetype in one call. This doesn't verify validity of the given time.</comment>
- <custom> icaltimetype *itt;
- g_return_if_fail(timetype != NULL);
- itt = (struct icaltimetype *)i_cal_object_get_native ((ICalObject *)timetype);
- g_return_if_fail(itt != NULL);
- itt->hour = hour;
- itt->minute = minute;
- itt->second = second; </custom>
- </method>
-</structure>
diff --git a/src/libical-glib/api/i-cal-timezone-phase.xml b/src/libical-glib/api/i-cal-timezone-phase.xml
index d7c796d7..145b2c00 100644
--- a/src/libical-glib/api/i-cal-timezone-phase.xml
+++ b/src/libical-glib/api/i-cal-timezone-phase.xml
@@ -13,14 +13,14 @@
You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
-->
-<structure namespace="ICal" name="TimezonePhase" native="struct icaltimezonephase" is_bare="true" default_native="i_cal_timezone_phase_new_default ()" includes="libical-glib/i-cal-timetype.h, libical-glib/i-cal-datetimeperiod-type.h">
+<structure namespace="ICal" name="TimezonePhase" native="struct icaltimezonephase" is_bare="true" default_native="i_cal_timezone_phase_new_default ()" includes="libical-glib/i-cal-time.h, libical-glib/i-cal-datetimeperiod-type.h">
<method name="i_cal_timezone_phase_new_default" corresponds="CUSTOM" kind="private" since="1.0">
<returns type="struct icaltimezonephase" annotation="transfer full" comment="The newly created #ICalTimezonePhase" />
<comment xml:space="preserve">Create a new default #ICalTimezonePhase</comment>
<custom> struct icaltimezonephase timezonephase;
timezonephase.tzname = NULL;
timezonephase.is_stdandard = 1;
- timezonephase.dtstart = i_cal_timetype_new_default ();
+ timezonephase.dtstart = icaltime_null_time();
timezonephase.offsetto = 0;
timezonephase.tzoffsetfrom = 0;
timezonephase.comment = NULL;
@@ -51,17 +51,17 @@
</method>
<method name="i_cal_timezone_phase_get_dtstart" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The dtstart of #ICalTimezonePhase."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The dtstart of #ICalTimezonePhase."/>
<comment>Get the dtstart from #ICalTimezonePhase.</comment>
<custom> g_return_val_if_fail (phase != NULL &amp;&amp; I_CAL_IS_TIMEZONE_PHASE (phase), NULL);
- return i_cal_timetype_new_full (((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->dtstart);</custom>
+ return i_cal_time_new_full (((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->dtstart);</custom>
</method>
<method name="i_cal_timezone_phase_set_dtstart" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/>
- <parameter type="ICalTimetype *" name="dtstart" comment="The dtstart of #ICalTimezonePhase."/>
+ <parameter type="ICalTime *" name="dtstart" comment="The dtstart of #ICalTimezonePhase."/>
<comment>Set the dtstart from #ICalTimezonePhase.</comment>
<custom> g_return_if_fail (phase != NULL &amp;&amp; I_CAL_IS_TIMEZONE_PHASE (phase));
- g_return_if_fail (dtstart != NULL &amp;&amp; I_CAL_IS_TIMETYPE (dtstart));
+ g_return_if_fail (dtstart != NULL &amp;&amp; I_CAL_IS_TIME(dtstart));
((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->dtstart = *(struct icaltimetype *)i_cal_object_get_native ((ICalObject *)dtstart);</custom>
</method>
<method name="i_cal_timezone_phase_get_offsetto" corresponds="CUSTOM" kind="get" since="1.0">
diff --git a/src/libical-glib/api/i-cal-timezone.xml b/src/libical-glib/api/i-cal-timezone.xml
index f7907c37..6eb72335 100644
--- a/src/libical-glib/api/i-cal-timezone.xml
+++ b/src/libical-glib/api/i-cal-timezone.xml
@@ -114,21 +114,21 @@
<comment xml:space="preserve">Get the display name of the @zone.</comment>
</method>
<method name="i_cal_timezone_convert_time" corresponds="icaltimezone_convert_time" kind="other" since="1.0">
- <parameter type="ICalTimetype *" name="tt" native_op="POINTER" comment="The time to be converted"/>
+ <parameter type="ICalTime *" name="tt" native_op="POINTER" comment="The time to be converted"/>
<parameter type="ICalTimezone *" name="from_zone" annotation="nullable" comment="from timezone"/>
<parameter type="ICalTimezone *" name="to_zone" annotation="nullable" comment="to timezone"/>
<comment>Convert time from one timezone to another.</comment>
</method>
<method name="i_cal_timezone_get_utc_offset" corresponds="icaltimezone_get_utc_offset" kind="get" since="1.0">
<parameter type="ICalTimezone *" name="zone" annotation="nullable" comment="The given #ICalTimezone."/>
- <parameter type="ICalTimetype *" name="tt" annotation="nullable" native_op="POINTER" comment="The local time."/>
+ <parameter type="ICalTime *" name="tt" annotation="nullable" native_op="POINTER" comment="The local time."/>
<parameter type="gint *" name="is_daylight" comment="whether it is day light."/>
<returns type="gint" comment="UTC offset of the @zone"/>
<comment>Calculates the UTC offset of a given local time in the given timezone. It is the number of seconds to add to UTC to get local time. The is_daylight flag is set to 1 if the time is in daylight-savings time.</comment>
</method>
<method name="i_cal_timezone_get_utc_offset_of_utc_time" corresponds="icaltimezone_get_utc_offset_of_utc_time" kind="get" since="1.0">
<parameter type="ICalTimezone *" name="zone" annotation="nullable" comment="The given #ICalTimezone."/>
- <parameter type="ICalTimetype *" name="tt" native_op="POINTER" comment="The local time."/>
+ <parameter type="ICalTime *" name="tt" native_op="POINTER" comment="The local time."/>
<parameter type="gint *" name="is_daylight" annotation="nullable" comment="whether it is day light, can be %NULL"/>
<returns type="gint" comment="UTC offset of the @zone"/>
<comment>Calculates the UTC offset of a given UTC time in the given timezone. It is the number of seconds to add to UTC to get local time. The is_daylight flag is set to 1 if the time is in daylight-savings time.</comment>
diff --git a/src/libical-glib/api/i-cal-timezonetype.xml b/src/libical-glib/api/i-cal-timezonetype.xml
index 225fc616..536e1192 100644
--- a/src/libical-glib/api/i-cal-timezonetype.xml
+++ b/src/libical-glib/api/i-cal-timezonetype.xml
@@ -13,13 +13,13 @@
You should have received a copy of the GNU Lesser General Public License
along with this library. If not, see <http://www.gnu.org/licenses/>.
-->
-<structure namespace="ICal" name="Timezonetype" native="struct icaltimezonetype" is_bare="true" default_native="i_cal_timezonetype_new_default ()" includes="libical-glib/i-cal-timetype.h">
+<structure namespace="ICal" name="Timezonetype" native="struct icaltimezonetype" is_bare="true" default_native="i_cal_timezonetype_new_default ()" includes="libical-glib/i-cal-time.h">
<method name="i_cal_timezonetype_new_default" corresponds="CUSTOM" kind="private" since="1.0">
<returns type="struct icaltimezonetype" annotation="transfer full" comment="The newly created #ICalTimezonetype" />
<comment xml:space="preserve">Create a new default #ICalTimezonetype</comment>
<custom> struct icaltimezonetype timezonetype;
timezonetype.tzid = NULL;
- timezonetype.last_mod = i_cal_timetype_new_default ();
+ timezonetype.last_mod = icaltime_null_time();
timezonetype.tzurl = NULL;
timezonetype.phases = NULL;
return timezonetype;</custom>
@@ -40,17 +40,17 @@
</method>
<method name="i_cal_timezonetype_get_last_mod" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalTimezonetype *" name="timezonetype" comment="The #ICalTimezonetype."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The last_mod of #ICalTimezonetype."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The last_mod of #ICalTimezonetype."/>
<comment>Get the last_mod from #ICalTimezonetype.</comment>
<custom> g_return_val_if_fail (timezonetype != NULL &amp;&amp; I_CAL_IS_TIMEZONETYPE (timezonetype), NULL);
- return i_cal_timetype_new_full (((struct icaltimezonetype *)i_cal_object_get_native ((ICalObject *)timezonetype))->last_mod);</custom>
+ return i_cal_time_new_full (((struct icaltimezonetype *)i_cal_object_get_native ((ICalObject *)timezonetype))->last_mod);</custom>
</method>
<method name="i_cal_timezonetype_set_last_mod" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalTimezonetype *" name="timezonetype" comment="The #ICalTimezonetype."/>
- <parameter type="ICalTimetype *" name="last_mod" comment="The last_mod of #ICalTimezonetype."/>
+ <parameter type="ICalTime *" name="last_mod" comment="The last_mod of #ICalTimezonetype."/>
<comment>Set the last_mod from #ICalTimezonetype.</comment>
<custom> g_return_if_fail (timezonetype != NULL &amp;&amp; I_CAL_IS_TIMEZONETYPE (timezonetype));
- g_return_if_fail (last_mod != NULL &amp;&amp; I_CAL_IS_TIMETYPE (last_mod));
+ g_return_if_fail (last_mod != NULL &amp;&amp; I_CAL_IS_TIME(last_mod));
((struct icaltimezonetype *)i_cal_object_get_native ((ICalObject *)timezonetype))->last_mod = *(struct icaltimetype *)i_cal_object_get_native ((ICalObject *)last_mod);</custom>
</method>
</structure>
diff --git a/src/libical-glib/api/i-cal-trigger-type.xml b/src/libical-glib/api/i-cal-trigger-type.xml
index 157cec58..c50d903c 100644
--- a/src/libical-glib/api/i-cal-trigger-type.xml
+++ b/src/libical-glib/api/i-cal-trigger-type.xml
@@ -36,17 +36,17 @@
</method>
<method name="i_cal_trigger_type_get_time" corresponds="CUSTOM" kind="get" since="1.0">
<parameter type="ICalTriggerType *" name="trigger" comment="The #ICalTriggerType."/>
- <returns type="ICalTimetype *" annotation="transfer full" comment="The time of #ICalTriggerType."/>
+ <returns type="ICalTime *" annotation="transfer full" comment="The time of #ICalTriggerType."/>
<comment>Get the time from #ICalTriggerType.</comment>
<custom> g_return_val_if_fail (trigger != NULL &amp;&amp; I_CAL_IS_TRIGGER_TYPE (trigger), NULL);
- return i_cal_timetype_new_full (((struct icaltriggertype *)i_cal_object_get_native ((ICalObject *)trigger))->time);</custom>
+ return i_cal_time_new_full (((struct icaltriggertype *)i_cal_object_get_native ((ICalObject *)trigger))->time);</custom>
</method>
<method name="i_cal_trigger_type_set_time" corresponds="CUSTOM" kind="set" since="1.0">
<parameter type="ICalTriggerType *" name="trigger" comment="The #ICalTriggerType."/>
- <parameter type="ICalTimetype *" name="time" comment="The time of #ICalTriggerType."/>
+ <parameter type="ICalTime *" name="time" comment="The time of #ICalTriggerType."/>
<comment>Set the time from #ICalTriggerType.</comment>
<custom> g_return_if_fail (trigger != NULL &amp;&amp; I_CAL_IS_TRIGGER_TYPE (trigger));
- g_return_if_fail (time != NULL &amp;&amp; I_CAL_IS_TIMETYPE (time));
+ g_return_if_fail (time != NULL &amp;&amp; I_CAL_IS_TIME(time));
((struct icaltriggertype *)i_cal_object_get_native ((ICalObject *)trigger))->time = *(struct icaltimetype *)i_cal_object_get_native ((ICalObject *)time);</custom>
</method>
<method name="i_cal_trigger_type_get_duration" corresponds="CUSTOM" kind="get" since="1.0">
diff --git a/src/test/libical-glib/component.py b/src/test/libical-glib/component.py
index 253d30dd..f8e9981c 100755
--- a/src/test/libical-glib/component.py
+++ b/src/test/libical-glib/component.py
@@ -237,10 +237,10 @@ def main():
#Test get_dtstart and get_dtend
comp = ICalGLib.Component.new_from_string(event_str1);
dtstart = comp.get_dtstart();
- start_string = ICalGLib.time_as_ical_string_r(dtstart);
+ start_string = ICalGLib.Time.as_ical_string_r(dtstart);
assert(start_string == "20140306T090000");
dtend = comp.get_dtend();
- end_string = ICalGLib.time_as_ical_string_r(dtend);
+ end_string = dtend.as_ical_string_r();
assert(end_string == "20140306T093000");
#Test span
@@ -249,8 +249,8 @@ def main():
assert(span.get_end() == 1394098200);
assert(span.get_is_busy() == 1);
utc = ICalGLib.Timezone.get_utc_timezone();
- comp.set_dtstart(ICalGLib.time_from_timet_with_zone(1494096400, 0, utc));
- comp.set_dtend(ICalGLib.time_from_timet_with_zone(1494098200, 0, utc));
+ comp.set_dtstart(ICalGLib.Time.from_timet_with_zone(1494096400, 0, utc));
+ comp.set_dtend(ICalGLib.Time.from_timet_with_zone(1494098200, 0, utc));
span = comp.get_span();
assert(span.get_start() == 1494096400);
assert(span.get_end() == 1494098200);
@@ -299,7 +299,7 @@ def main():
counter = TestCounter()
comp = ICalGLib.Component.new_from_string(recurring_str)
- comp.foreach_recurrence(ICalGLib.time_from_string("20180321T000000Z"), ICalGLib.time_from_string("20180323T235959Z"), foreachRecurrenceCb, counter)
+ comp.foreach_recurrence(ICalGLib.Time.from_string("20180321T000000Z"), ICalGLib.Time.from_string("20180323T235959Z"), foreachRecurrenceCb, counter)
assert counter.counter == 3
if __name__ == "__main__":
diff --git a/src/test/libical-glib/comprehensive.py b/src/test/libical-glib/comprehensive.py
index bec4500c..d1ffed3a 100755
--- a/src/test/libical-glib/comprehensive.py
+++ b/src/test/libical-glib/comprehensive.py
@@ -187,8 +187,8 @@ def main():
if (child_component.get_summary() == "childEvent2"):
child_component.set_summary("childEventTwo");
- start = ICalGLib.time_from_string("20141115T211923");
- end = ICalGLib.time_from_string("20141115T221923");
+ start = ICalGLib.Time.from_string("20141115T211923");
+ end = ICalGLib.Time.from_string("20141115T221923");
child_component.set_dtstart(start);
child_component.set_dtend(end);
@@ -212,14 +212,14 @@ def main():
child_component.set_summary("childEventTwo");
dtstart = child_component.get_dtstart();
- start_string = ICalGLib.time_as_ical_string_r(dtstart);
+ start_string = ICalGLib.Time.as_ical_string_r(dtstart);
assert(start_string == "20141115T211923");
dtend = child_component.get_dtend();
- end_string = ICalGLib.time_as_ical_string_r(dtend);
+ end_string = ICalGLib.Time.as_ical_string_r(dtend);
assert(end_string == "20141115T221923");
timestamp = child_component.get_dtstamp();
- assert(ICalGLib.time_as_ical_string_r(timestamp) == "20141115T211923");
+ assert(ICalGLib.Time.as_ical_string_r(timestamp) == "20141115T211923");
assert(child_component.get_location() == "East Lansing, MI, US");
assert(child_component.get_relcalid() == "relcalid for childEventTwo");
diff --git a/src/test/libical-glib/misc.py b/src/test/libical-glib/misc.py
index 6ec8edb4..f5ce5d90 100644..100755
--- a/src/test/libical-glib/misc.py
+++ b/src/test/libical-glib/misc.py
@@ -37,17 +37,17 @@ assert geo_clone.get_lon() == 40.0
assert geo.get_lat() != geo_clone.get_lat()
assert geo.get_lon() != geo_clone.get_lon()
-start = ICalGLib.time_from_string("20190130T111213Z");
-end = ICalGLib.time_from_string("20190203T100908Z")
+start = ICalGLib.Time.from_string("20190130T111213Z");
+end = ICalGLib.Time.from_string("20190203T100908Z")
span = ICalGLib.TimeSpan.new(start, end, 0);
-assert span.get_start() == ICalGLib.time_as_timet(start)
-assert span.get_end() == ICalGLib.time_as_timet(end)
+assert span.get_start() == start.as_timet()
+assert span.get_end() == end.as_timet()
assert span.get_is_busy() == 0
-start = ICalGLib.time_from_string("20190330T131415Z");
-end = ICalGLib.time_from_string("20190403T070605Z")
+start = ICalGLib.Time.from_string("20190330T131415Z");
+end = ICalGLib.Time.from_string("20190403T070605Z")
span = ICalGLib.TimeSpan.new(start, end, 1);
-assert span.get_start() == ICalGLib.time_as_timet(start)
-assert span.get_end() == ICalGLib.time_as_timet(end)
+assert span.get_start() == start.as_timet()
+assert span.get_end() == end.as_timet()
assert span.get_is_busy() == 1
span = ICalGLib.TimeSpan.new_timet(11, 22, 1)
diff --git a/src/test/libical-glib/recurrence-type.py b/src/test/libical-glib/recurrence-type.py
index 81f5a2e2..b943410a 100755
--- a/src/test/libical-glib/recurrence-type.py
+++ b/src/test/libical-glib/recurrence-type.py
@@ -274,20 +274,20 @@ while day != 0:
day = timetype.get_day()
recurrence = ICalGLib.RecurrenceType.from_string("FREQ=YEARLY;COUNT=10")
-start = ICalGLib.time_from_string("20161224T000000Z")
+start = ICalGLib.Time.from_string("20161224T000000Z")
iter = ICalGLib.RecurIterator.new(recurrence, start)
-start = ICalGLib.time_from_string("20181224T000000Z")
+start = ICalGLib.Time.from_string("20181224T000000Z")
assert ICalGLib.RecurIterator.set_start(iter, start) == 0
recurrence = ICalGLib.RecurrenceType.from_string("FREQ=YEARLY")
-start = ICalGLib.time_from_string("20161224T000000Z")
+start = ICalGLib.Time.from_string("20161224T000000Z")
iter = ICalGLib.RecurIterator.new(recurrence, start)
-start = ICalGLib.time_from_string("20181224T000000Z")
+start = ICalGLib.Time.from_string("20181224T000000Z")
assert ICalGLib.RecurIterator.set_start(iter, start) == 1
timetype = iter.next()
diff --git a/src/test/libical-glib/timezone.py b/src/test/libical-glib/timezone.py
index 829de026..bb8ef238 100755
--- a/src/test/libical-glib/timezone.py
+++ b/src/test/libical-glib/timezone.py
@@ -62,43 +62,43 @@ assert utc.get_display_name() == "UTC";
utc2 = ICalGLib.Timezone.get_utc_timezone();
assert utc == utc2
-time = ICalGLib.Timetype.new();
+time = ICalGLib.Time.new();
before = time.get_hour();
-ICalGLib.Timezone.convert_time(time, la, chicago);
+ICalGLib.timezone_convert_time(time, la, chicago);
after = time.get_hour();
assert abs(after - before) == 2;
-ICalGLib.Timetype.set_zone(time, utc);
-assert ICalGLib.Timetype.get_zone(time) == utc;
-ICalGLib.Timetype.set_zone(time, la);
-assert ICalGLib.Timetype.get_zone(time) == la;
+ICalGLib.Time.set_timezone(time, utc);
+assert ICalGLib.Time.get_timezone(time) == utc;
+ICalGLib.Time.set_timezone(time, la);
+assert ICalGLib.Time.get_timezone(time) == la;
timeclone = time.new_clone()
assert time != timeclone
-time = ICalGLib.time_convert_to_zone(time, chicago)
-ICalGLib.time_convert_to_zone_inplace(timeclone, chicago)
+time = ICalGLib.Time.convert_to_zone(time, chicago)
+timeclone.convert_to_zone_inplace(chicago)
assert time.get_year() == timeclone.get_year();
assert time.get_month() == timeclone.get_month();
assert time.get_day() == timeclone.get_day();
assert time.get_hour() == timeclone.get_hour();
assert time.get_minute() == timeclone.get_minute();
assert time.get_second() == timeclone.get_second();
-assert time.get_is_date() == timeclone.get_is_date();
-assert time.get_is_daylight() == timeclone.get_is_daylight();
-assert time.get_zone() == timeclone.get_zone();
+assert time.get_timezone() == timeclone.get_timezone();
+assert time.is_date() == timeclone.is_date();
+assert time.is_daylight() == timeclone.is_daylight();
assert time.is_utc() == timeclone.is_utc();
-timeclone = ICalGLib.Timetype.new_clone(time);
+timeclone = ICalGLib.Time.new_clone(time);
assert time != timeclone;
-assert ICalGLib.Timetype.get_year(time) == ICalGLib.Timetype.get_year(timeclone);
-assert ICalGLib.Timetype.get_month(time) == ICalGLib.Timetype.get_month(timeclone);
-assert ICalGLib.Timetype.get_day(time) == ICalGLib.Timetype.get_day(timeclone);
-assert ICalGLib.Timetype.get_hour(time) == ICalGLib.Timetype.get_hour(timeclone);
-assert ICalGLib.Timetype.get_minute(time) == ICalGLib.Timetype.get_minute(timeclone);
-assert ICalGLib.Timetype.get_second(time) == ICalGLib.Timetype.get_second(timeclone);
-assert ICalGLib.Timetype.get_is_date(time) == ICalGLib.Timetype.get_is_date(timeclone);
-assert ICalGLib.Timetype.get_is_daylight(time) == ICalGLib.Timetype.get_is_daylight(timeclone);
-assert ICalGLib.Timetype.get_zone(time) == ICalGLib.Timetype.get_zone(timeclone);
-assert ICalGLib.Timetype.is_utc(time) == ICalGLib.Timetype.is_utc(timeclone);
+assert ICalGLib.Time.get_year(time) == ICalGLib.Time.get_year(timeclone);
+assert ICalGLib.Time.get_month(time) == ICalGLib.Time.get_month(timeclone);
+assert ICalGLib.Time.get_day(time) == ICalGLib.Time.get_day(timeclone);
+assert ICalGLib.Time.get_hour(time) == ICalGLib.Time.get_hour(timeclone);
+assert ICalGLib.Time.get_minute(time) == ICalGLib.Time.get_minute(timeclone);
+assert ICalGLib.Time.get_second(time) == ICalGLib.Time.get_second(timeclone);
+assert ICalGLib.Time.get_timezone(time) == ICalGLib.Time.get_timezone(timeclone);
+assert ICalGLib.Time.is_date(time) == ICalGLib.Time.is_date(timeclone);
+assert ICalGLib.Time.is_daylight(time) == ICalGLib.Time.is_daylight(timeclone);
+assert ICalGLib.Time.is_utc(time) == ICalGLib.Time.is_utc(timeclone);
time.set_date(2019, 1, 24)
assert time.get_year() == 2019