From 45fdeb790bdedab65bb864c32a9f7a483c27d27e Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Sat, 3 Apr 1999 23:57:14 +0000 Subject: Added this routine so Monthly recurrences use the weekday field as a 1999-04-01 Steve Murphy * calobj.c (weekdaynum): Added this routine so Monthly recurrences use the weekday field as a simple integer for a single weekday. * calobj.c (load_recur_monthly_pos): Call weekdaynum instead of weekdaylist. The interface only lets the user input a single value anyway. * calobj.c (ical_object_to_vobject): instead of code to output day names from a bit array, use instead the value as an int and output a single dayname. * calobj.c (ical_object_generate_events): first_week_day gets the day int instead of the first entry in the bit field. I inserted a fair chunk of code to avoid calling generate if the day is out of range for a month. It may be unneccessary, because mktime will turn the extra days into a valid date the next month. But not all mktimes are equal, I fear. * eventedit.c (ee_store_recur_rule_to_ical): For case 3, (Monthly), I added code to set the interval slot of the recur struct; without this value, selecting a monthly recursing, by date, would lead to an infinite loop broken only by a failure to alloc more memory. Also, in the "by position" case, both u.month_pos and u.month_day were being assigned values. This is a mistake, as they are both part of an union, and the same thing. The weekday field should get the recur_rr_month_weekday value. * eventedit.c (ee_rp_init_rule): set default day from the weekday field instead of the u.month_day field, which is really the month_pos value. * gnome-cal.c (gnome_calendar_tag_calendar): Month days start with 1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime will generate a time corresponding to the end of the previous month, which may have a mday anywhere from 28 to 31. The end time just adds 1 to the month, so your end time may not cover the last few days of this month, depending on what the biggest mday of last month was. I changed it so tm_mday is set to 1 instead. 1999-03-30 Federico Mena Quintero svn path=/trunk/; revision=792 --- calendar/eventedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'calendar/eventedit.c') diff --git a/calendar/eventedit.c b/calendar/eventedit.c index abd7670e8a..e97e39e8a2 100644 --- a/calendar/eventedit.c +++ b/calendar/eventedit.c @@ -580,7 +580,7 @@ ee_store_recur_rule_to_ical (EventEditor *ee) ical->recur->u.month_pos = option_menu_active_number (ee->recur_rr_month_day); - ical->recur->u.month_day = + ical->recur->weekday = option_menu_active_number (ee->recur_rr_month_weekday); ical->recur->interval = gtk_spin_button_get_value_as_int ( @@ -1014,7 +1014,7 @@ ee_rp_init_rule (EventEditor *ee) page = 3; month_period = interval; def_pos = ee->ical->recur->u.month_pos; - default_day = ee->ical->recur->u.month_day; + default_day = ee->ical->recur->weekday; /* you can't use u.month_pos and u.month_day-- it's a union... */ break; case RECUR_MONTHLY_BY_DAY: -- cgit