From 8d4a49fe281a22136757b160ba5edce68c3bd2cd Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Fri, 8 Apr 2005 10:20:02 +0000 Subject: Fixes #74265 In time_days_in_month the months are indexed from 0, so 2005-04-08 Chenthill Palanisamy Fixes #74265 * itip-view.c (format_date_and_time_x): In time_days_in_month the months are indexed from 0, so subtract one from the month argument and send it. svn path=/trunk/; revision=29189 --- plugins/itip-formatter/ChangeLog | 7 +++++++ plugins/itip-formatter/itip-view.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'plugins/itip-formatter') diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index cc349e78c0..35de67ff8d 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2005-04-08 Chenthill Palanisamy + + Fixes #74265 + * itip-view.c (format_date_and_time_x): In time_days_in_month + the months are indexed from 0, so subtract one from the month + argument and send it. + 2005-04-07 JP Rosevear Fixes #74291 diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 2553987f35..08256f1f3e 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -139,7 +139,7 @@ format_date_and_time_x (struct tm *date_tm, /* Calculate a normalized "tomorrow" */ tomorrow_tm = *current_tm; - if (tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) { + if (tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon - 1)) { tomorrow_tm.tm_mday = 1; if (tomorrow_tm.tm_mon == 11) { tomorrow_tm.tm_mon = 1; @@ -153,8 +153,8 @@ format_date_and_time_x (struct tm *date_tm, /* Calculate a normalized "next seven days" */ week_tm = *current_tm; - if (week_tm.tm_mday + 6 > time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) { - week_tm.tm_mday = (week_tm.tm_mday + 6) % time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon); + if (week_tm.tm_mday + 6 > time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon - 1)) { + week_tm.tm_mday = (week_tm.tm_mday + 6) % time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon - 1); if (week_tm.tm_mon == 11) { week_tm.tm_mon = 1; week_tm.tm_year++; -- cgit v1.2.3