aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@src.gnome.org>2001-07-12 02:58:38 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2001-07-12 02:58:38 +0800
commit127cae25a2bcb06343cda67831bcbb851cd56dad (patch)
treef617d2a3c6fc9eebfc6d2e429c3eabb0ced9a16e
parent56a08bea3a9da5c073f0ebc6b4cd7ff70643b39b (diff)
downloadgsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar.gz
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar.bz2
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar.lz
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar.xz
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.tar.zst
gsoc2013-evolution-127cae25a2bcb06343cda67831bcbb851cd56dad.zip
Shh
svn path=/trunk/; revision=11009
-rw-r--r--doc/devel/calendar/cal-util/.cvsignore1
-rw-r--r--doc/devel/calendar/cal-util/evolution-cal-util-decl.txt174
-rw-r--r--doc/devel/calendar/cal-util/tmpl/cal-recur.sgml2
-rw-r--r--doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml60
-rw-r--r--doc/devel/calendar/cal-util/tmpl/timeutil.sgml67
-rw-r--r--help/devel/calendar/cal-util/.cvsignore1
-rw-r--r--help/devel/calendar/cal-util/evolution-cal-util-decl.txt174
-rw-r--r--help/devel/calendar/cal-util/tmpl/cal-recur.sgml2
-rw-r--r--help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml60
-rw-r--r--help/devel/calendar/cal-util/tmpl/timeutil.sgml67
10 files changed, 376 insertions, 232 deletions
diff --git a/doc/devel/calendar/cal-util/.cvsignore b/doc/devel/calendar/cal-util/.cvsignore
index 35810bb3ff..4c0883da0a 100644
--- a/doc/devel/calendar/cal-util/.cvsignore
+++ b/doc/devel/calendar/cal-util/.cvsignore
@@ -9,3 +9,4 @@ Makefile.in
*.hierarchy
*.stamp
*-scan.c
+.libs
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
index a00e51ab2e..631a3ca267 100644
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -585,6 +585,11 @@ CalComponent *comp, GSList *attendee_list
CalComponent *comp1, CalComponent *comp2
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_compare_event_timezone</NAME>
+<RETURNS>gboolean </RETURNS>
+CalComponent *comp, icaltimezone *zone
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_free_categories_list</NAME>
<RETURNS>void </RETURNS>
GSList *categ_list
@@ -702,6 +707,16 @@ typedef struct {
} u;
} CalAlarmTrigger;
</TYPEDEF>
+<TYPEDEF>
+<NAME>CalAlarmRepeat</NAME>
+typedef struct {
+ /* Number of extra repetitions, zero for none */
+ int repetitions;
+
+ /* Interval between repetitions */
+ struct icaldurationtype duration;
+} CalAlarmRepeat;
+</TYPEDEF>
<FUNCTION>
<NAME>cal_component_has_alarms</NAME>
<RETURNS>gboolean </RETURNS>
@@ -743,6 +758,11 @@ void
CalComponentAlarm *alarm
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_alarm_free</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_alarm_get_uid</NAME>
<RETURNS>const char *</RETURNS>
CalComponentAlarm *alarm
@@ -758,6 +778,36 @@ CalComponentAlarm *alarm, CalAlarmAction *action
CalComponentAlarm *alarm, CalAlarmAction action
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_alarm_get_attach</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, struct icalattachtype **attach
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_attach</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, struct icalattachtype *attach
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_get_description</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalComponentText *description
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_description</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalComponentText *description
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_get_repeat</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalAlarmRepeat *repeat
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_repeat</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalAlarmRepeat repeat
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_alarm_get_trigger</NAME>
<RETURNS>void </RETURNS>
CalComponentAlarm *alarm, CalAlarmTrigger *trigger
@@ -767,11 +817,6 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger
<RETURNS>void </RETURNS>
CalComponentAlarm *alarm, CalAlarmTrigger trigger
</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
<USER_FUNCTION>
<NAME>CalRecurInstanceFn</NAME>
<RETURNS>gboolean </RETURNS>
@@ -780,10 +825,16 @@ CalComponent *comp,
time_t instance_end,
gpointer data
</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>CalRecurResolveTimezoneFn</NAME>
+<RETURNS>icaltimezone *</RETURNS>
+const char *tzid,
+ gpointer data
+</USER_FUNCTION>
<FUNCTION>
<NAME>cal_recur_generate_instances</NAME>
<RETURNS>void </RETURNS>
-CalComponent *comp,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data
+CalComponent *comp,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data,CalRecurResolveTimezoneFn tz_cb,gpointer tz_cb_data
</FUNCTION>
<TYPEDEF>
<NAME>CalObjInstance</NAME>
@@ -813,92 +864,117 @@ typedef enum {
GList *list
</FUNCTION>
<FUNCTION>
+<NAME>time_days_in_month</NAME>
+<RETURNS>int </RETURNS>
+int year, int month
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_of_year</NAME>
+<RETURNS>int </RETURNS>
+int day, int month, int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_of_week</NAME>
+<RETURNS>int </RETURNS>
+int day, int month, int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_is_leap_year</NAME>
+<RETURNS>gboolean </RETURNS>
+int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_leap_years_up_to</NAME>
+<RETURNS>int </RETURNS>
+int year
+</FUNCTION>
+<FUNCTION>
<NAME>isodate_from_time_t</NAME>
<RETURNS>char *</RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
<NAME>time_from_isodate</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
const char *str
</FUNCTION>
<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
<NAME>time_add_day</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int days
</FUNCTION>
<FUNCTION>
<NAME>time_add_week</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int weeks
</FUNCTION>
<FUNCTION>
<NAME>time_add_month</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int months
</FUNCTION>
<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t </RETURNS>
-time_t time, int years
+<NAME>time_year_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int </RETURNS>
-int year, int month
+<NAME>time_month_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t </RETURNS>
-int year, int month, int day
+<NAME>time_week_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t, int week_start_day
</FUNCTION>
<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t </RETURNS>
+<NAME>time_day_begin</NAME>
+<RETURNS>time_t </RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t </RETURNS>
+<NAME>time_day_end</NAME>
+<RETURNS>time_t </RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_add_day_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int days, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_add_week_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int weeks, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t, int week_start_day
+<NAME>time_add_month_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int months, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t, int week_start_day
+<NAME>time_year_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_month_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_week_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int week_start_day,icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void </RETURNS>
-time_t t
+<NAME>time_day_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_end_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
diff --git a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
index 092b547809..a8e7cf1620 100644
--- a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml
@@ -38,5 +38,7 @@ cal-recur
@end:
@cb:
@cb_data:
+@tz_cb:
+@tz_cb_data:
diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index 98c3ac55dd..878273b0aa 100644
--- a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
@@ -192,6 +192,31 @@ End:
@str:
@Returns:
+<!-- ##### FUNCTION print_time_t ##### -->
+<para>
+
+</para>
+
+@t:
+
+<!-- ##### FUNCTION time_add_minutes ##### -->
+<para>
+
+</para>
+
+@time:
+@minutes:
+@Returns:
+
+<!-- ##### FUNCTION time_add_year ##### -->
+<para>
+
+</para>
+
+@time:
+@years:
+@Returns:
+
<!-- ##### FUNCTION time_day_hour ##### -->
<para>
@@ -201,6 +226,16 @@ End:
@hour:
@Returns:
+<!-- ##### FUNCTION time_from_day ##### -->
+<para>
+
+</para>
+
+@year:
+@month:
+@day:
+@Returns:
+
<!-- ##### FUNCTION time_from_icaltimetype ##### -->
<para>
@@ -226,3 +261,28 @@ End:
@duration:
@Returns:
+<!-- ##### FUNCTION time_month_end ##### -->
+<para>
+
+</para>
+
+@t:
+@Returns:
+
+<!-- ##### FUNCTION time_week_end ##### -->
+<para>
+
+</para>
+
+@t:
+@week_start_day:
+@Returns:
+
+<!-- ##### FUNCTION time_year_end ##### -->
+<para>
+
+</para>
+
+@t:
+@Returns:
+
diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
index 2e7e15988d..e2dba5224f 100644
--- a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml
@@ -23,16 +23,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time:
-@minutes:
-@Returns:
-
-
<!-- ##### FUNCTION time_add_day ##### -->
<para>
@@ -63,16 +53,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time:
-@years:
-@Returns:
-
-
<!-- ##### FUNCTION time_days_in_month ##### -->
<para>
@@ -83,17 +63,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year:
-@month:
-@day:
-@Returns:
-
-
<!-- ##### FUNCTION time_year_begin ##### -->
<para>
@@ -103,15 +72,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t:
-@Returns:
-
-
<!-- ##### FUNCTION time_month_begin ##### -->
<para>
@@ -121,15 +81,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t:
-@Returns:
-
-
<!-- ##### FUNCTION time_week_begin ##### -->
<para>
@@ -140,16 +91,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t:
-@week_start_day:
-@Returns:
-
-
<!-- ##### FUNCTION time_day_begin ##### -->
<para>
@@ -168,11 +109,3 @@ timeutil
@Returns:
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t:
-
-
diff --git a/help/devel/calendar/cal-util/.cvsignore b/help/devel/calendar/cal-util/.cvsignore
index 35810bb3ff..4c0883da0a 100644
--- a/help/devel/calendar/cal-util/.cvsignore
+++ b/help/devel/calendar/cal-util/.cvsignore
@@ -9,3 +9,4 @@ Makefile.in
*.hierarchy
*.stamp
*-scan.c
+.libs
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
index a00e51ab2e..631a3ca267 100644
--- a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -585,6 +585,11 @@ CalComponent *comp, GSList *attendee_list
CalComponent *comp1, CalComponent *comp2
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_compare_event_timezone</NAME>
+<RETURNS>gboolean </RETURNS>
+CalComponent *comp, icaltimezone *zone
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_free_categories_list</NAME>
<RETURNS>void </RETURNS>
GSList *categ_list
@@ -702,6 +707,16 @@ typedef struct {
} u;
} CalAlarmTrigger;
</TYPEDEF>
+<TYPEDEF>
+<NAME>CalAlarmRepeat</NAME>
+typedef struct {
+ /* Number of extra repetitions, zero for none */
+ int repetitions;
+
+ /* Interval between repetitions */
+ struct icaldurationtype duration;
+} CalAlarmRepeat;
+</TYPEDEF>
<FUNCTION>
<NAME>cal_component_has_alarms</NAME>
<RETURNS>gboolean </RETURNS>
@@ -743,6 +758,11 @@ void
CalComponentAlarm *alarm
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_alarm_free</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_alarm_get_uid</NAME>
<RETURNS>const char *</RETURNS>
CalComponentAlarm *alarm
@@ -758,6 +778,36 @@ CalComponentAlarm *alarm, CalAlarmAction *action
CalComponentAlarm *alarm, CalAlarmAction action
</FUNCTION>
<FUNCTION>
+<NAME>cal_component_alarm_get_attach</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, struct icalattachtype **attach
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_attach</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, struct icalattachtype *attach
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_get_description</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalComponentText *description
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_description</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalComponentText *description
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_get_repeat</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalAlarmRepeat *repeat
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_repeat</NAME>
+<RETURNS>void </RETURNS>
+CalComponentAlarm *alarm, CalAlarmRepeat repeat
+</FUNCTION>
+<FUNCTION>
<NAME>cal_component_alarm_get_trigger</NAME>
<RETURNS>void </RETURNS>
CalComponentAlarm *alarm, CalAlarmTrigger *trigger
@@ -767,11 +817,6 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger
<RETURNS>void </RETURNS>
CalComponentAlarm *alarm, CalAlarmTrigger trigger
</FUNCTION>
-<FUNCTION>
-<NAME>cal_component_alarm_free</NAME>
-<RETURNS>void </RETURNS>
-CalComponentAlarm *alarm
-</FUNCTION>
<USER_FUNCTION>
<NAME>CalRecurInstanceFn</NAME>
<RETURNS>gboolean </RETURNS>
@@ -780,10 +825,16 @@ CalComponent *comp,
time_t instance_end,
gpointer data
</USER_FUNCTION>
+<USER_FUNCTION>
+<NAME>CalRecurResolveTimezoneFn</NAME>
+<RETURNS>icaltimezone *</RETURNS>
+const char *tzid,
+ gpointer data
+</USER_FUNCTION>
<FUNCTION>
<NAME>cal_recur_generate_instances</NAME>
<RETURNS>void </RETURNS>
-CalComponent *comp,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data
+CalComponent *comp,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data,CalRecurResolveTimezoneFn tz_cb,gpointer tz_cb_data
</FUNCTION>
<TYPEDEF>
<NAME>CalObjInstance</NAME>
@@ -813,92 +864,117 @@ typedef enum {
GList *list
</FUNCTION>
<FUNCTION>
+<NAME>time_days_in_month</NAME>
+<RETURNS>int </RETURNS>
+int year, int month
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_of_year</NAME>
+<RETURNS>int </RETURNS>
+int day, int month, int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_of_week</NAME>
+<RETURNS>int </RETURNS>
+int day, int month, int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_is_leap_year</NAME>
+<RETURNS>gboolean </RETURNS>
+int year
+</FUNCTION>
+<FUNCTION>
+<NAME>time_leap_years_up_to</NAME>
+<RETURNS>int </RETURNS>
+int year
+</FUNCTION>
+<FUNCTION>
<NAME>isodate_from_time_t</NAME>
<RETURNS>char *</RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
<NAME>time_from_isodate</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
const char *str
</FUNCTION>
<FUNCTION>
-<NAME>time_add_minutes</NAME>
-<RETURNS>time_t </RETURNS>
-time_t time, int minutes
-</FUNCTION>
-<FUNCTION>
<NAME>time_add_day</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int days
</FUNCTION>
<FUNCTION>
<NAME>time_add_week</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int weeks
</FUNCTION>
<FUNCTION>
<NAME>time_add_month</NAME>
-<RETURNS>time_t </RETURNS>
+<RETURNS>time_t </RETURNS>
time_t time, int months
</FUNCTION>
<FUNCTION>
-<NAME>time_add_year</NAME>
-<RETURNS>time_t </RETURNS>
-time_t time, int years
+<NAME>time_year_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_days_in_month</NAME>
-<RETURNS>int </RETURNS>
-int year, int month
+<NAME>time_month_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_from_day</NAME>
-<RETURNS>time_t </RETURNS>
-int year, int month, int day
+<NAME>time_week_begin</NAME>
+<RETURNS>time_t </RETURNS>
+time_t t, int week_start_day
</FUNCTION>
<FUNCTION>
-<NAME>time_year_begin</NAME>
-<RETURNS>time_t </RETURNS>
+<NAME>time_day_begin</NAME>
+<RETURNS>time_t </RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_year_end</NAME>
-<RETURNS>time_t </RETURNS>
+<NAME>time_day_end</NAME>
+<RETURNS>time_t </RETURNS>
time_t t
</FUNCTION>
<FUNCTION>
-<NAME>time_month_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_add_day_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int days, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_month_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_add_week_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int weeks, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_week_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t, int week_start_day
+<NAME>time_add_month_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int months, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_week_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t, int week_start_day
+<NAME>time_year_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_day_begin</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_month_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>time_day_end</NAME>
-<RETURNS>time_t </RETURNS>
-time_t t
+<NAME>time_week_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, int week_start_day,icaltimezone *zone
</FUNCTION>
<FUNCTION>
-<NAME>print_time_t</NAME>
-<RETURNS>void </RETURNS>
-time_t t
+<NAME>time_day_begin_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
+</FUNCTION>
+<FUNCTION>
+<NAME>time_day_end_with_zone</NAME>
+<RETURNS>time_t </RETURNS>
+time_t time, icaltimezone *zone
</FUNCTION>
diff --git a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml b/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
index 092b547809..a8e7cf1620 100644
--- a/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
+++ b/help/devel/calendar/cal-util/tmpl/cal-recur.sgml
@@ -38,5 +38,7 @@ cal-recur
@end:
@cb:
@cb_data:
+@tz_cb:
+@tz_cb_data:
diff --git a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
index 98c3ac55dd..878273b0aa 100644
--- a/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
+++ b/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml
@@ -192,6 +192,31 @@ End:
@str:
@Returns:
+<!-- ##### FUNCTION print_time_t ##### -->
+<para>
+
+</para>
+
+@t:
+
+<!-- ##### FUNCTION time_add_minutes ##### -->
+<para>
+
+</para>
+
+@time:
+@minutes:
+@Returns:
+
+<!-- ##### FUNCTION time_add_year ##### -->
+<para>
+
+</para>
+
+@time:
+@years:
+@Returns:
+
<!-- ##### FUNCTION time_day_hour ##### -->
<para>
@@ -201,6 +226,16 @@ End:
@hour:
@Returns:
+<!-- ##### FUNCTION time_from_day ##### -->
+<para>
+
+</para>
+
+@year:
+@month:
+@day:
+@Returns:
+
<!-- ##### FUNCTION time_from_icaltimetype ##### -->
<para>
@@ -226,3 +261,28 @@ End:
@duration:
@Returns:
+<!-- ##### FUNCTION time_month_end ##### -->
+<para>
+
+</para>
+
+@t:
+@Returns:
+
+<!-- ##### FUNCTION time_week_end ##### -->
+<para>
+
+</para>
+
+@t:
+@week_start_day:
+@Returns:
+
+<!-- ##### FUNCTION time_year_end ##### -->
+<para>
+
+</para>
+
+@t:
+@Returns:
+
diff --git a/help/devel/calendar/cal-util/tmpl/timeutil.sgml b/help/devel/calendar/cal-util/tmpl/timeutil.sgml
index 2e7e15988d..e2dba5224f 100644
--- a/help/devel/calendar/cal-util/tmpl/timeutil.sgml
+++ b/help/devel/calendar/cal-util/tmpl/timeutil.sgml
@@ -23,16 +23,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_add_minutes ##### -->
-<para>
-
-</para>
-
-@time:
-@minutes:
-@Returns:
-
-
<!-- ##### FUNCTION time_add_day ##### -->
<para>
@@ -63,16 +53,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_add_year ##### -->
-<para>
-
-</para>
-
-@time:
-@years:
-@Returns:
-
-
<!-- ##### FUNCTION time_days_in_month ##### -->
<para>
@@ -83,17 +63,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_from_day ##### -->
-<para>
-
-</para>
-
-@year:
-@month:
-@day:
-@Returns:
-
-
<!-- ##### FUNCTION time_year_begin ##### -->
<para>
@@ -103,15 +72,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_year_end ##### -->
-<para>
-
-</para>
-
-@t:
-@Returns:
-
-
<!-- ##### FUNCTION time_month_begin ##### -->
<para>
@@ -121,15 +81,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_month_end ##### -->
-<para>
-
-</para>
-
-@t:
-@Returns:
-
-
<!-- ##### FUNCTION time_week_begin ##### -->
<para>
@@ -140,16 +91,6 @@ timeutil
@Returns:
-<!-- ##### FUNCTION time_week_end ##### -->
-<para>
-
-</para>
-
-@t:
-@week_start_day:
-@Returns:
-
-
<!-- ##### FUNCTION time_day_begin ##### -->
<para>
@@ -168,11 +109,3 @@ timeutil
@Returns:
-<!-- ##### FUNCTION print_time_t ##### -->
-<para>
-
-</para>
-
-@t:
-
-