From 34fc37b5d9aecf9b339b99b8a0fd3d579e29d5db Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 20 Oct 2008 03:51:11 +0000 Subject: Milan Crha ** Fix for bug #514989 (Calculate tomorrow from current time, not from the date to convert). svn path=/trunk/; revision=36655 --- plugins/itip-formatter/ChangeLog | 7 +++++++ plugins/itip-formatter/itip-view.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 448ee918d0..f408872cdc 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2008-10-20 Milan Crha + + ** Fix for bug #514989 + + * itip-view.c: (format_date_and_time_x): + Calculate tomorrow from current time, not from the date to convert. + 2008-10-14 Srinivasa Ragavan ** Fix for bug #550441 diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 8055420d67..92a8460e48 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -152,7 +152,7 @@ format_date_and_time_x (struct tm *date_tm, /* Calculate a normalized "tomorrow" */ tomorrow_tm = *current_tm; /* Don't need this if date is in the past. Also, year assumption won't fail. */ - if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) { + if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (current_tm->tm_year + 1900, current_tm->tm_mon)) { tomorrow_tm.tm_mday = 1; if (tomorrow_tm.tm_mon == 11) { tomorrow_tm.tm_mon = 1; -- cgit v1.2.3