** 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

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f1abc74..6cfdc8e 100644 (file)
--- 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 b951c34..c0645f4 100644 (file)
--- 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;