diff options
| author | Russell Steinthal <steintr@src.gnome.org> | 1999-10-24 08:21:10 +0800 |
|---|---|---|
| committer | Russell Steinthal <steintr@src.gnome.org> | 1999-10-24 08:21:10 +0800 |
| commit | 24517cf8ae7cad5c49efcc11c82435570ab08211 (patch) | |
| tree | f85cde36545fda1fc1ceb3cdc911fbef554ceb20 | |
| parent | 8fe1aa5f41bfec98795cc71df37d4afbbc34464f (diff) | |
| download | gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar.gz gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar.bz2 gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar.lz gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar.xz gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.tar.zst gsoc2013-evolution-24517cf8ae7cad5c49efcc11c82435570ab08211.zip | |
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
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/calendar.c | 4 | ||||
| -rw-r--r-- | calendar/gui/calendar.c | 4 |
3 files changed, 13 insertions, 0 deletions
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 <rms39@columbia.edu> + + * calendar.c (calendar_new): Correctly initialize calendar_day_end + and calendar_day_begin *before* installing day-change alarm. + 1999-10-21 Russell Steinthal <rms39@columbia.edu> * 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); |