summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2007-11-16 12:08:22 +0000
committerMilan Crha <mcrha@src.gnome.org>2007-11-16 12:08:22 +0000
commitd9358b872bd2f5e2874feaeabd73fa5ee03f3568 (patch)
tree9e7658579ca7d47e926b02ef8a64607146cfd786
parent0cf3b78f4e62cc20094934bce7a74ae2f715d2b0 (diff)
downloadevolution-data-server-d9358b872bd2f5e2874feaeabd73fa5ee03f3568.tar.gz
** Fix for bug #300584 by Peter Lord
2007-11-16 Milan Crha <mcrha@redhat.com> ** Fix for bug #300584 by Peter Lord * backends/contacts/e-cal-backend-contacts.c: (cdate_to_icaltime): Use correct year when filling structure, not only years 1970+. svn path=/trunk/; revision=8216
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/backends/contacts/e-cal-backend-contacts.c6
2 files changed, 8 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f1abc7456..6cfdc8eba 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-16 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #300584 by Peter Lord
+
+ * backends/contacts/e-cal-backend-contacts.c: (cdate_to_icaltime):
+ Use correct year when filling structure, not only years 1970+.
+
2007-11-13 Ondrej Jirman <megous@megous.com>
** Fix for bug #494303
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index b951c3488..c0645f41b 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -391,11 +391,7 @@ cdate_to_icaltime (EContactDate *cdate)
{
struct icaltimetype ret;
-/*FIXME: this is a really _ugly_ (temporary) hack
- * since several functions are still depending on the epoch,
- * let entries start (earliest) at 19700101
- */
- ret.year = cdate->year >= 1970 ? cdate->year : 1970;
+ ret.year = cdate->year;
ret.month = cdate->month;
ret.day = cdate->day;
ret.is_date = TRUE;