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 +cal_component_compare_event_timezone +gboolean +CalComponent *comp, icaltimezone *zone + + cal_component_free_categories_list void GSList *categ_list @@ -702,6 +707,16 @@ typedef struct { } u; } CalAlarmTrigger; + +CalAlarmRepeat +typedef struct { + /* Number of extra repetitions, zero for none */ + int repetitions; + + /* Interval between repetitions */ + struct icaldurationtype duration; +} CalAlarmRepeat; + cal_component_has_alarms gboolean @@ -743,6 +758,11 @@ void CalComponentAlarm *alarm +cal_component_alarm_free +void +CalComponentAlarm *alarm + + cal_component_alarm_get_uid const char * CalComponentAlarm *alarm @@ -758,6 +778,36 @@ CalComponentAlarm *alarm, CalAlarmAction *action CalComponentAlarm *alarm, CalAlarmAction action +cal_component_alarm_get_attach +void +CalComponentAlarm *alarm, struct icalattachtype **attach + + +cal_component_alarm_set_attach +void +CalComponentAlarm *alarm, struct icalattachtype *attach + + +cal_component_alarm_get_description +void +CalComponentAlarm *alarm, CalComponentText *description + + +cal_component_alarm_set_description +void +CalComponentAlarm *alarm, CalComponentText *description + + +cal_component_alarm_get_repeat +void +CalComponentAlarm *alarm, CalAlarmRepeat *repeat + + +cal_component_alarm_set_repeat +void +CalComponentAlarm *alarm, CalAlarmRepeat repeat + + cal_component_alarm_get_trigger void CalComponentAlarm *alarm, CalAlarmTrigger *trigger @@ -767,11 +817,6 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger void CalComponentAlarm *alarm, CalAlarmTrigger trigger - -cal_component_alarm_free -void -CalComponentAlarm *alarm - CalRecurInstanceFn gboolean @@ -780,10 +825,16 @@ CalComponent *comp, time_t instance_end, gpointer data + +CalRecurResolveTimezoneFn +icaltimezone * +const char *tzid, + gpointer data + cal_recur_generate_instances void -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 CalObjInstance @@ -813,92 +864,117 @@ typedef enum { GList *list +time_days_in_month +int +int year, int month + + +time_day_of_year +int +int day, int month, int year + + +time_day_of_week +int +int day, int month, int year + + +time_is_leap_year +gboolean +int year + + +time_leap_years_up_to +int +int year + + isodate_from_time_t char * time_t t time_from_isodate -time_t +time_t const char *str -time_add_minutes -time_t -time_t time, int minutes - - time_add_day -time_t +time_t time_t time, int days time_add_week -time_t +time_t time_t time, int weeks time_add_month -time_t +time_t time_t time, int months -time_add_year -time_t -time_t time, int years - - -time_days_in_month -int -int year, int month - - -time_from_day -time_t -int year, int month, int day - - time_year_begin -time_t -time_t t - - -time_year_end -time_t +time_t time_t t time_month_begin -time_t -time_t t - - -time_month_end -time_t +time_t time_t t time_week_begin -time_t -time_t t, int week_start_day - - -time_week_end -time_t +time_t time_t t, int week_start_day time_day_begin -time_t +time_t time_t t time_day_end -time_t +time_t time_t t -print_time_t -void -time_t t +time_add_day_with_zone +time_t +time_t time, int days, icaltimezone *zone + + +time_add_week_with_zone +time_t +time_t time, int weeks, icaltimezone *zone + + +time_add_month_with_zone +time_t +time_t time, int months, icaltimezone *zone + + +time_year_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_month_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_week_begin_with_zone +time_t +time_t time, int week_start_day,icaltimezone *zone + + +time_day_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_day_end_with_zone +time_t +time_t time, icaltimezone *zone 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: + + + + + +@t: + + + + + + +@time: +@minutes: +@Returns: + + + + + + +@time: +@years: +@Returns: + @@ -201,6 +226,16 @@ End: @hour: @Returns: + + + + + +@year: +@month: +@day: +@Returns: + @@ -226,3 +261,28 @@ End: @duration: @Returns: + + + + + +@t: +@Returns: + + + + + + +@t: +@week_start_day: +@Returns: + + + + + + +@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: - - - - - -@time: -@minutes: -@Returns: - - @@ -63,16 +53,6 @@ timeutil @Returns: - - - - - -@time: -@years: -@Returns: - - @@ -83,17 +63,6 @@ timeutil @Returns: - - - - - -@year: -@month: -@day: -@Returns: - - @@ -103,15 +72,6 @@ timeutil @Returns: - - - - - -@t: -@Returns: - - @@ -121,15 +81,6 @@ timeutil @Returns: - - - - - -@t: -@Returns: - - @@ -140,16 +91,6 @@ timeutil @Returns: - - - - - -@t: -@week_start_day: -@Returns: - - @@ -168,11 +109,3 @@ timeutil @Returns: - - - - - -@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 +cal_component_compare_event_timezone +gboolean +CalComponent *comp, icaltimezone *zone + + cal_component_free_categories_list void GSList *categ_list @@ -702,6 +707,16 @@ typedef struct { } u; } CalAlarmTrigger; + +CalAlarmRepeat +typedef struct { + /* Number of extra repetitions, zero for none */ + int repetitions; + + /* Interval between repetitions */ + struct icaldurationtype duration; +} CalAlarmRepeat; + cal_component_has_alarms gboolean @@ -743,6 +758,11 @@ void CalComponentAlarm *alarm +cal_component_alarm_free +void +CalComponentAlarm *alarm + + cal_component_alarm_get_uid const char * CalComponentAlarm *alarm @@ -758,6 +778,36 @@ CalComponentAlarm *alarm, CalAlarmAction *action CalComponentAlarm *alarm, CalAlarmAction action +cal_component_alarm_get_attach +void +CalComponentAlarm *alarm, struct icalattachtype **attach + + +cal_component_alarm_set_attach +void +CalComponentAlarm *alarm, struct icalattachtype *attach + + +cal_component_alarm_get_description +void +CalComponentAlarm *alarm, CalComponentText *description + + +cal_component_alarm_set_description +void +CalComponentAlarm *alarm, CalComponentText *description + + +cal_component_alarm_get_repeat +void +CalComponentAlarm *alarm, CalAlarmRepeat *repeat + + +cal_component_alarm_set_repeat +void +CalComponentAlarm *alarm, CalAlarmRepeat repeat + + cal_component_alarm_get_trigger void CalComponentAlarm *alarm, CalAlarmTrigger *trigger @@ -767,11 +817,6 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger void CalComponentAlarm *alarm, CalAlarmTrigger trigger - -cal_component_alarm_free -void -CalComponentAlarm *alarm - CalRecurInstanceFn gboolean @@ -780,10 +825,16 @@ CalComponent *comp, time_t instance_end, gpointer data + +CalRecurResolveTimezoneFn +icaltimezone * +const char *tzid, + gpointer data + cal_recur_generate_instances void -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 CalObjInstance @@ -813,92 +864,117 @@ typedef enum { GList *list +time_days_in_month +int +int year, int month + + +time_day_of_year +int +int day, int month, int year + + +time_day_of_week +int +int day, int month, int year + + +time_is_leap_year +gboolean +int year + + +time_leap_years_up_to +int +int year + + isodate_from_time_t char * time_t t time_from_isodate -time_t +time_t const char *str -time_add_minutes -time_t -time_t time, int minutes - - time_add_day -time_t +time_t time_t time, int days time_add_week -time_t +time_t time_t time, int weeks time_add_month -time_t +time_t time_t time, int months -time_add_year -time_t -time_t time, int years - - -time_days_in_month -int -int year, int month - - -time_from_day -time_t -int year, int month, int day - - time_year_begin -time_t -time_t t - - -time_year_end -time_t +time_t time_t t time_month_begin -time_t -time_t t - - -time_month_end -time_t +time_t time_t t time_week_begin -time_t -time_t t, int week_start_day - - -time_week_end -time_t +time_t time_t t, int week_start_day time_day_begin -time_t +time_t time_t t time_day_end -time_t +time_t time_t t -print_time_t -void -time_t t +time_add_day_with_zone +time_t +time_t time, int days, icaltimezone *zone + + +time_add_week_with_zone +time_t +time_t time, int weeks, icaltimezone *zone + + +time_add_month_with_zone +time_t +time_t time, int months, icaltimezone *zone + + +time_year_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_month_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_week_begin_with_zone +time_t +time_t time, int week_start_day,icaltimezone *zone + + +time_day_begin_with_zone +time_t +time_t time, icaltimezone *zone + + +time_day_end_with_zone +time_t +time_t time, icaltimezone *zone 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: + + + + + +@t: + + + + + + +@time: +@minutes: +@Returns: + + + + + + +@time: +@years: +@Returns: + @@ -201,6 +226,16 @@ End: @hour: @Returns: + + + + + +@year: +@month: +@day: +@Returns: + @@ -226,3 +261,28 @@ End: @duration: @Returns: + + + + + +@t: +@Returns: + + + + + + +@t: +@week_start_day: +@Returns: + + + + + + +@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: - - - - - -@time: -@minutes: -@Returns: - - @@ -63,16 +53,6 @@ timeutil @Returns: - - - - - -@time: -@years: -@Returns: - - @@ -83,17 +63,6 @@ timeutil @Returns: - - - - - -@year: -@month: -@day: -@Returns: - - @@ -103,15 +72,6 @@ timeutil @Returns: - - - - - -@t: -@Returns: - - @@ -121,15 +81,6 @@ timeutil @Returns: - - - - - -@t: -@Returns: - - @@ -140,16 +91,6 @@ timeutil @Returns: - - - - - -@t: -@week_start_day: -@Returns: - - @@ -168,11 +109,3 @@ timeutil @Returns: - - - - - -@t: - -