X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fcalendar_view.c;h=ae4cc32ded989feee9b638b2d45c3e53bdde0ca6;hb=06cddfe0786cc7af165dd2205ddedb2701b9f093;hp=3f6d034fc29962b81422a79db6d5f8abc63dedb8;hpb=d483599297f034a3b444d28fe02ec1cc2f1d0bb6;p=citadel.git diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c index 3f6d034fc..ae4cc32de 100644 --- a/webcit/calendar_view.c +++ b/webcit/calendar_view.c @@ -658,7 +658,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, starting_tm.tm_year = year - 1900; starting_tm.tm_mon = month - 1; starting_tm.tm_mday = day; - starting_tm.tm_hour = 0; + starting_tm.tm_hour = hour; starting_tm.tm_min = 0; today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone()); today_start_t.is_utc = 1; @@ -667,7 +667,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, ending_tm.tm_year = year - 1900; ending_tm.tm_mon = month - 1; ending_tm.tm_mday = day; - ending_tm.tm_hour = 23; + ending_tm.tm_hour = hour; ending_tm.tm_min = 59; today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone()); today_end_t.is_utc = 1; @@ -696,7 +696,7 @@ void calendar_day_view_display_events(time_t thetime, int year, int month, if (all_day_event) { - show_event = ((t.year == year) && (t.month == month) && (t.day == day)); + show_event = ((t.year == year) && (t.month == month) && (t.day == day) && (hour == -1)); } else {