[evolution-patches] 58748
- From: JP Rosevear <jpr novell com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] 58748
- Date: Thu, 15 Jul 2004 03:41:48 -0400
Turns out this was actually two bugs, one for the general case of all
day events and a second bug for birthdays/anniversaries only. This now
fixes the latter as well in e-d-s.
-JP
--
JP Rosevear <jpr novell com>
Novell, Inc.
? 58748-eds.patch
? libical/src/libicalss/icalssyacc.output
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.296
diff -u -r1.296 ChangeLog
--- ChangeLog 14 Jul 2004 09:32:15 -0000 1.296
+++ ChangeLog 15 Jul 2004 07:41:37 -0000
@@ -1,3 +1,13 @@
+2004-07-15 JP Rosevear <jpr novell com>
+
+ Fixes #58748
+
+ * backends/contacts/e-cal-backend-contacts.c (cdate_to_icaltime):
+ explicitly set is_utc and set zone to NULL
+ (create_component): use NULL instead of 0
+ (e_cal_backend_contacts_set_default_timezone): fix logic typo so
+ that the default zone is set correctly
+
2004-07-14 Chenthill Palanisamy <pchenthill novell com>
Fixes #60344
Index: backends/contacts/e-cal-backend-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/e-cal-backend-contacts.c,v
retrieving revision 1.11
diff -u -r1.11 e-cal-backend-contacts.c
--- backends/contacts/e-cal-backend-contacts.c 14 Jun 2004 16:30:25 -0000 1.11
+++ backends/contacts/e-cal-backend-contacts.c 15 Jul 2004 07:41:37 -0000
@@ -376,7 +376,8 @@
ret.month = cdate->month;
ret.day = cdate->day;
ret.is_date = TRUE;
- ret.zone = icaltimezone_get_utc_timezone ();
+ ret.is_utc = FALSE;
+ ret.zone = NULL;
ret.hour = ret.minute = ret.second = 0;
@@ -413,13 +414,13 @@
/* Set all-day event's date from contact data */
itt = cdate_to_icaltime (cdate);
dt.value = &itt;
- dt.tzid = 0;
+ dt.tzid = NULL;
e_cal_component_set_dtstart (cal_comp, &dt);
itt = cdate_to_icaltime (cdate);
icaltime_adjust (&itt, 1, 0, 0, 0);
dt.value = &itt;
- dt.tzid = 0;
+ dt.tzid = NULL;
/* We have to add 1 day to DTEND, as it is not inclusive. */
e_cal_component_set_dtend (cal_comp, &dt);
@@ -428,12 +429,12 @@
r.freq = ICAL_YEARLY_RECURRENCE;
r.interval = 1;
recur_list.data = &r;
- recur_list.next = 0;
+ recur_list.next = NULL;
e_cal_component_set_rrule_list (cal_comp, &recur_list);
/* Create summary */
comp_summary.value = summary;
- comp_summary.altrep = 0;
+ comp_summary.altrep = NULL;
e_cal_component_set_summary (cal_comp, &comp_summary);
/* Set category and visibility */
@@ -803,7 +804,7 @@
priv = cbcontacts->priv;
priv->default_zone = e_cal_backend_internal_get_timezone (E_CAL_BACKEND (backend), tzid);
- if (priv->default_zone) {
+ if (!priv->default_zone) {
priv->default_zone = icaltimezone_get_utc_timezone ();
return GNOME_Evolution_Calendar_ObjectNotFound;
Index: libecal/e-cal-recur.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-recur.c,v
retrieving revision 1.4
diff -u -r1.4 e-cal-recur.c
--- libecal/e-cal-recur.c 18 May 2004 14:42:48 -0000 1.4
+++ libecal/e-cal-recur.c 15 Jul 2004 07:41:38 -0000
@@ -114,7 +114,7 @@
#define MAX_YEAR 2037
/* Define this for some debugging output. */
-#if 0
+#if 1
#define CAL_OBJ_DEBUG 1
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]