diff options
| -rw-r--r-- | ReleaseNotes.txt | 4 | ||||
| -rw-r--r-- | doc/reference/libical-glib/libical-glib-docs.sgml.in | 2 | ||||
| -rw-r--r-- | src/libical-glib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libical-glib/api/i-cal-timezone-phase.xml | 124 | ||||
| -rw-r--r-- | src/libical-glib/api/i-cal-timezonetype.xml | 56 | ||||
| -rw-r--r-- | src/libical/icaltypes.h | 22 |
6 files changed, 4 insertions, 206 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3973a719..463a4f59 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,6 +11,10 @@ Version 3.1.0 (NOT RELEASED YET): * Deprecated functions: + caldat + juldat + * Removed unused declarations: + (in the public headers but not used at all) + + struct icaltimezonetype + + struct icaltimezonephase Version 3.0.5 (NOT RELEASED YET): ------------- diff --git a/doc/reference/libical-glib/libical-glib-docs.sgml.in b/doc/reference/libical-glib/libical-glib-docs.sgml.in index fb111dff..0470b09e 100644 --- a/doc/reference/libical-glib/libical-glib-docs.sgml.in +++ b/doc/reference/libical-glib/libical-glib-docs.sgml.in @@ -42,8 +42,6 @@ <xi:include href="xml/i-cal-time.xml"/> <xi:include href="xml/i-cal-time-span.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"/> <xi:include href="xml/i-cal-trigger.xml"/> <xi:include href="xml/i-cal-unknowntokenhandling.xml"/> <xi:include href="xml/i-cal-value.xml"/> diff --git a/src/libical-glib/CMakeLists.txt b/src/libical-glib/CMakeLists.txt index 4980162e..d3059c25 100644 --- a/src/libical-glib/CMakeLists.txt +++ b/src/libical-glib/CMakeLists.txt @@ -38,8 +38,6 @@ list(APPEND API_FILES api/i-cal-restriction.xml api/i-cal-time-span.xml api/i-cal-time.xml - api/i-cal-timezone-phase.xml - api/i-cal-timezonetype.xml api/i-cal-timezone.xml api/i-cal-trigger.xml api/i-cal-unknowntokenhandling.xml diff --git a/src/libical-glib/api/i-cal-timezone-phase.xml b/src/libical-glib/api/i-cal-timezone-phase.xml deleted file mode 100644 index e5ab0ba5..00000000 --- a/src/libical-glib/api/i-cal-timezone-phase.xml +++ /dev/null @@ -1,124 +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="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.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 = icaltime_null_time(); - timezonephase.offsetto = 0; - timezonephase.tzoffsetfrom = 0; - timezonephase.comment = NULL; - timezonephase.rdate = i_cal_datetimeperiod_new_default (); - timezonephase.rrule = NULL; - return timezonephase;</custom> - </method> - <method name="i_cal_timezone_phase_get_tzname" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="const gchar *" annotation="transfer none" comment="The tzname of @phase."/> - <comment>Get the tzname of #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), NULL); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->tzname;</custom> - </method> - <method name="i_cal_timezone_phase_is_stdandard" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="gint" comment="The is_stdandard of @phase."/> - <comment>Get the is_stdandard of #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), FALSE); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->is_stdandard;</custom> - </method> - <method name="i_cal_timezone_phase_set_is_stdandard" corresponds="CUSTOM" kind="set" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <parameter type="gint" name="is_stdandard" comment="The is_stdandard."/> - <comment>Set the is_stdandard of #ICalTimezonePhase.</comment> - <custom> g_return_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase)); - ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->is_stdandard = is_stdandard;</custom> - </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="ICalTime *" annotation="transfer full" comment="The dtstart of #ICalTimezonePhase."/> - <comment>Get the dtstart from #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), NULL); - 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="ICalTime *" name="dtstart" comment="The dtstart of #ICalTimezonePhase."/> - <comment>Set the dtstart from #ICalTimezonePhase.</comment> - <custom> g_return_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase)); - g_return_if_fail (dtstart != NULL && 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"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="gint" comment="The offsetto of @phase."/> - <comment>Get the offsetto of #ICalTimezonePhase. Returns -61 if there is an error.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), -61); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->offsetto;</custom> - </method> - <method name="i_cal_timezone_phase_set_offsetto" corresponds="CUSTOM" kind="set" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <parameter type="gint" name="offsetto" comment="The offsetto."/> - <comment>Set the offsetto of #ICalTimezonePhase.</comment> - <custom> g_return_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase)); - ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->offsetto = offsetto;</custom> - </method> - <method name="i_cal_timezone_phase_get_tzoffsetfrom" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="gint" comment="The tzoffsetfrom of @phase."/> - <comment>Get the tzoffsetfrom of #ICalTimezonePhase. Returns -61 if there is an error.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), -61); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->tzoffsetfrom;</custom> - </method> - <method name="i_cal_timezone_phase_set_tzoffsetfrom" corresponds="CUSTOM" kind="set" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <parameter type="gint" name="tzoffsetfrom" comment="The tzoffsetfrom."/> - <comment>Set the tzoffsetfrom of #ICalTimezonePhase.</comment> - <custom> g_return_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase)); - ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->tzoffsetfrom = tzoffsetfrom;</custom> - </method> - <method name="i_cal_timezone_phase_get_comment" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="const gchar *" annotation="transfer none" comment="The comment of @phase."/> - <comment>Get the comment of #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), NULL); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->comment;</custom> - </method> - <method name="i_cal_timezone_phase_get_rdate" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="ICalDatetimeperiod *" annotation="transfer full" comment="The rdate of #ICalTimezonePhase."/> - <comment>Get the rdate from #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), NULL); - return i_cal_datetimeperiod_new_full (((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->rdate);</custom> - </method> - <method name="i_cal_timezone_phase_set_rdate" corresponds="CUSTOM" kind="set" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <parameter type="ICalDatetimeperiod *" name="rdate" comment="The rdate of #ICalTimezonePhase."/> - <comment>Set the rdate from #ICalTimezonePhase.</comment> - <custom> g_return_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase)); - g_return_if_fail (rdate != NULL && I_CAL_IS_DATETIMEPERIOD (rdate)); - ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->rdate = *(struct icaldatetimeperiodtype *)i_cal_object_get_native ((ICalObject *)rdate);</custom> - </method> - <method name="i_cal_timezone_phase_get_rrule" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonePhase *" name="phase" comment="The #ICalTimezonePhase."/> - <returns type="const gchar *" annotation="transfer none" comment="The rrule of @phase."/> - <comment>Get the rrule of #ICalTimezonePhase.</comment> - <custom> g_return_val_if_fail (phase != NULL && I_CAL_IS_TIMEZONE_PHASE (phase), NULL); - return ((struct icaltimezonephase *)i_cal_object_get_native ((ICalObject *)phase))->rrule;</custom> - </method> -</structure> diff --git a/src/libical-glib/api/i-cal-timezonetype.xml b/src/libical-glib/api/i-cal-timezonetype.xml deleted file mode 100644 index 536e1192..00000000 --- a/src/libical-glib/api/i-cal-timezonetype.xml +++ /dev/null @@ -1,56 +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="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 = icaltime_null_time(); - timezonetype.tzurl = NULL; - timezonetype.phases = NULL; - return timezonetype;</custom> - </method> - <method name="i_cal_timezonetype_get_tzid" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonetype *" name="timezonetype" comment="The #ICalTimezonetype."/> - <returns type="const gchar *" annotation="transfer none" comment="The tzid of @timezonetype."/> - <comment>Get the tzid of #ICalTimezonetype.</comment> - <custom> g_return_val_if_fail (timezonetype != NULL && I_CAL_IS_TIMEZONETYPE (timezonetype), NULL); - return ((struct icaltimezonetype *)i_cal_object_get_native ((ICalObject *)timezonetype))->tzid;</custom> - </method> - <method name="i_cal_timezonetype_get_tzurl" corresponds="CUSTOM" kind="get" since="1.0"> - <parameter type="ICalTimezonetype *" name="timezonetype" comment="The #ICalTimezonetype."/> - <returns type="const gchar *" annotation="transfer none" comment="The tzurl of @timezonetype."/> - <comment>Get the tzurl of #ICalTimezonetype.</comment> - <custom> g_return_val_if_fail (timezonetype != NULL && I_CAL_IS_TIMEZONETYPE (timezonetype), NULL); - return ((struct icaltimezonetype *)i_cal_object_get_native ((ICalObject *)timezonetype))->tzurl;</custom> - </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="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 && I_CAL_IS_TIMEZONETYPE (timezonetype), NULL); - 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="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 && I_CAL_IS_TIMEZONETYPE (timezonetype)); - g_return_if_fail (last_mod != NULL && 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/icaltypes.h b/src/libical/icaltypes.h index 0221cb61..d1050f95 100644 --- a/src/libical/icaltypes.h +++ b/src/libical/icaltypes.h @@ -75,28 +75,6 @@ LIBICAL_ICAL_EXPORT const char *icalreqstattype_as_string(struct icalreqstattype LIBICAL_ICAL_EXPORT char *icalreqstattype_as_string_r(struct icalreqstattype); -struct icaltimezonephase -{ - const char *tzname; - int is_stdandard; /* 1 = standard tme, 0 = daylight savings time */ - struct icaltimetype dtstart; - int offsetto; - int tzoffsetfrom; - const char *comment; - struct icaldatetimeperiodtype rdate; - const char *rrule; -}; - -struct icaltimezonetype -{ - const char *tzid; - struct icaltimetype last_mod; - const char *tzurl; - - /* Array of phases. The end of the array is a phase with tzname == 0 */ - struct icaltimezonephase *phases; -}; - /* ical_unknown_token_handling : * How should the ICAL library handle components, properties and parameters with * unknown names? |