From 96439bc6fffe21b8359bd825aa89fc586d36380a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 2 Oct 1998 23:59:35 +0000 Subject: Changed name from time_start_of_day() to be consistent with the other 1998-10-02 Federico Mena Quintero * timeutil.c (time_day_begin): Changed name from time_start_of_day() to be consistent with the other begin/end functions. (time_day_end): Likewise. * calobj.c (ical_object_get_first_weekday): New public function to get the first toggled day in a weekday mask. Since we do not support multiple weekdays in a monthly-by-pos rule, we just fetch the first toggled one. (ical_object_generate_events): Added a missing break statement. * timeutil.c (time_month_end): Made it consistent with the rest of the time begin/end functions -- now it returns the first second of the *next* month. (time_week_end): Actually implemented this function. It will be used when the week view is rewritten. * calobj.c (time_in_range): Fix off-by-one in the comparison of the time against the end time. * gncal-full-day.c (expand_space): Fixed bug where the columns not were being expanded due to a missing "slot + j". svn path=/trunk/; revision=425 --- calendar/pcs/calobj.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'calendar/pcs/calobj.h') diff --git a/calendar/pcs/calobj.h b/calendar/pcs/calobj.h index d18acd4f8a..05f6d00291 100644 --- a/calendar/pcs/calobj.h +++ b/calendar/pcs/calobj.h @@ -100,7 +100,7 @@ typedef struct { * this is what got specified) or it is our computed * ending date (computed from the duration item). */ - + int weekday; union { @@ -175,7 +175,7 @@ typedef struct { } iCalObject; /* The callback for the recurrence generator */ -typedef int (*calendarfn)(iCalObject *, time_t, time_t, void *); +typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *); iCalObject *ical_new (char *comment, char *organizer, char *summary); iCalObject *ical_object_new (void); @@ -190,6 +190,11 @@ void ical_object_add_exdate (iCalObject *o, time_t t); /* Computes the enddate field of the recurrence based on the duration */ void ical_object_compute_end (iCalObject *ico); +/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple + * days on a monthly-by-pos recurrence. If no days are toggled, it returns -1. + */ +int ical_object_get_first_weekday (int weekday_mask); + /* Returns the number of seconds configured to trigger the alarm in advance to an event */ int alarm_compute_offset (CalendarAlarm *a); -- cgit v1.2.3