diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-10-20 11:51:00 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-10-20 11:51:00 +0800 |
| commit | cf0575881271f768fe149af5db761a86308efe39 (patch) | |
| tree | c3b5500272b35cbd684f834cceec115c0c0ea916 | |
| parent | 36b6832ca71ea1da2b4ab374d56912d6018dd2fb (diff) | |
| download | gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar.gz gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar.bz2 gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar.lz gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar.xz gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.tar.zst gsoc2013-evolution-cf0575881271f768fe149af5db761a86308efe39.zip | |
Milan Crha <mcrha@redhat.com> ** Fix for bug #514989 (Calculate tomorrow from current time, not from the date to convert).
svn path=/branches/gnome-2-24/; revision=36654
| -rw-r--r-- | plugins/itip-formatter/ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-view.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 5d6c05f62a..4d7b28e98d 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,10 @@ +2008-10-20 Milan Crha <mcrha@redhat.com> + + ** 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 <sragavan@novell.com> ** 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; |