From 24517cf8ae7cad5c49efcc11c82435570ab08211 Mon Sep 17 00:00:00 2001 From: Russell Steinthal Date: Sun, 24 Oct 1999 00:21:10 +0000 Subject: Fix calendar_day_begin/calendar_day_end initialization bug on HEAD. For full explanation, see commit message for parallel change to gnome-pim-1-0 branch. svn path=/trunk/; revision=1351 --- calendar/ChangeLog | 5 +++++ calendar/calendar.c | 4 ++++ calendar/gui/calendar.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index de2f6fab65..0ce0472fab 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +1999-10-23 Russell Steinthal + + * calendar.c (calendar_new): Correctly initialize calendar_day_end + and calendar_day_begin *before* installing day-change alarm. + 1999-10-21 Russell Steinthal * alarm.c, main.c: Added alarm debugging code diff --git a/calendar/calendar.c b/calendar/calendar.c index 57c9ad9230..ec67b3243e 100644 --- a/calendar/calendar.c +++ b/calendar/calendar.c @@ -30,6 +30,7 @@ extern char *tzname[2]; time_t calendar_day_begin, calendar_day_end; static void calendar_init_alarms (Calendar *cal); +static void calendar_set_day (void); Calendar * calendar_new (char *title) @@ -40,6 +41,9 @@ calendar_new (char *title) cal->title = g_strdup (title); + if ((calendar_day_begin == 0) || (calendar_day_end == 0)) + calendar_set_day (); + cal->event_hash = g_hash_table_new (g_str_hash, g_str_equal); calendar_init_alarms (cal); diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c index 57c9ad9230..ec67b3243e 100644 --- a/calendar/gui/calendar.c +++ b/calendar/gui/calendar.c @@ -30,6 +30,7 @@ extern char *tzname[2]; time_t calendar_day_begin, calendar_day_end; static void calendar_init_alarms (Calendar *cal); +static void calendar_set_day (void); Calendar * calendar_new (char *title) @@ -40,6 +41,9 @@ calendar_new (char *title) cal->title = g_strdup (title); + if ((calendar_day_begin == 0) || (calendar_day_end == 0)) + calendar_set_day (); + cal->event_hash = g_hash_table_new (g_str_hash, g_str_equal); calendar_init_alarms (cal); -- cgit v1.2.3