From 463f842fc090709b1aa85b08c93d68ca12b6c70c Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 4 Jun 1998 23:58:58 +0000 Subject: Do not subtract 1 from tm->tm_mday for the default_day. 1998-06-04 Federico Mena Quintero * eventedit.c (ee_rp_init_rule): Do not subtract 1 from tm->tm_mday for the default_day. * gnome-cal.c (gnome_calendar_new): (gnome_calendar_goto): Use the start of the day -- things expect it to be that way. svn path=/trunk/; revision=244 --- calendar/ChangeLog | 9 +++++++++ calendar/Makefile.am | 4 ++-- calendar/eventedit.c | 2 +- calendar/gnome-cal.c | 4 +++- calendar/gui/Makefile.am | 4 ++-- calendar/gui/eventedit.c | 2 +- calendar/gui/gnome-cal.c | 4 +++- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 700274e1f1..a8d6f80b51 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +1998-06-04 Federico Mena Quintero + + * eventedit.c (ee_rp_init_rule): Do not subtract 1 from + tm->tm_mday for the default_day. + + * gnome-cal.c (gnome_calendar_new): + (gnome_calendar_goto): Use the start of the day -- things expect + it to be that way. + 1998-05-27 Nuno Ferreira * eventedit.c (ee_store_recur_rule_to_ical): Fill in diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 43726a6714..9ab62f33a9 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = versit +SUBDIRS = versit card help_base = $(datadir)/gnome/help/cal CFLAGS += -Wall @@ -88,4 +88,4 @@ install-data-local: $(mkinstalldirs) $(help_base)/C $(INSTALL_DATA) $(srcdir)/topic.dat $(help_base)/C/topic.dat $(INSTALL_DATA) $(srcdir)/gnome-cal.html $(help_base)/C/gnome-cal.html - cd $(help_base)/C; ln -sf gnome-cal.html index.html \ No newline at end of file + cd $(help_base)/C; ln -sf gnome-cal.html index.html diff --git a/calendar/eventedit.c b/calendar/eventedit.c index 7a686ec264..4cc9ce65b6 100644 --- a/calendar/eventedit.c +++ b/calendar/eventedit.c @@ -965,7 +965,7 @@ ee_rp_init_rule (EventEditor *ee) /* Default to today */ week_vector = 1 << tm->tm_wday; - default_day = tm->tm_mday - 1; + default_day = tm->tm_mday; def_pos = 0; def_off = 0; diff --git a/calendar/gnome-cal.c b/calendar/gnome-cal.c index 6e2f318fae..e96a6add8b 100644 --- a/calendar/gnome-cal.c +++ b/calendar/gnome-cal.c @@ -78,6 +78,8 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time) g_return_if_fail (new_time != -1); + new_time = time_start_of_day (new_time); + if (current == gcal->day_view) gncal_day_panel_set (GNCAL_DAY_PANEL (gcal->day_view), new_time); else if (current == gcal->week_view) @@ -148,7 +150,7 @@ gnome_calendar_new (char *title) gtk_window_set_title(GTK_WINDOW(retval), title); - gcal->current_display = time (NULL); + gcal->current_display = time_start_of_day (time (NULL)); gcal->cal = calendar_new (title); setup_widgets (gcal); return retval; diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 43726a6714..9ab62f33a9 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = versit +SUBDIRS = versit card help_base = $(datadir)/gnome/help/cal CFLAGS += -Wall @@ -88,4 +88,4 @@ install-data-local: $(mkinstalldirs) $(help_base)/C $(INSTALL_DATA) $(srcdir)/topic.dat $(help_base)/C/topic.dat $(INSTALL_DATA) $(srcdir)/gnome-cal.html $(help_base)/C/gnome-cal.html - cd $(help_base)/C; ln -sf gnome-cal.html index.html \ No newline at end of file + cd $(help_base)/C; ln -sf gnome-cal.html index.html diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c index 7a686ec264..4cc9ce65b6 100644 --- a/calendar/gui/eventedit.c +++ b/calendar/gui/eventedit.c @@ -965,7 +965,7 @@ ee_rp_init_rule (EventEditor *ee) /* Default to today */ week_vector = 1 << tm->tm_wday; - default_day = tm->tm_mday - 1; + default_day = tm->tm_mday; def_pos = 0; def_off = 0; diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 6e2f318fae..e96a6add8b 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -78,6 +78,8 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time) g_return_if_fail (new_time != -1); + new_time = time_start_of_day (new_time); + if (current == gcal->day_view) gncal_day_panel_set (GNCAL_DAY_PANEL (gcal->day_view), new_time); else if (current == gcal->week_view) @@ -148,7 +150,7 @@ gnome_calendar_new (char *title) gtk_window_set_title(GTK_WINDOW(retval), title); - gcal->current_display = time (NULL); + gcal->current_display = time_start_of_day (time (NULL)); gcal->cal = calendar_new (title); setup_widgets (gcal); return retval; -- cgit v1.2.3