aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog15
-rw-r--r--calendar/gui/comp-util.c2
-rw-r--r--calendar/gui/e-day-view.c3
-rw-r--r--calendar/gui/e-week-view.c3
4 files changed, 19 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8dba0a0ba6..4d0339cf6e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,18 @@
+2004-07-15 Rodrigo Moya <rodrigo@novell.com>
+
+ Fixes #57142
+
+ * gui/e-day-view.c (e_day_view_on_editing_stopped): commit the
+ sequence on the object before sending it to the backend.
+ (e_day_view_add_event): s/abort_sequence/commit_sequence.
+
+ * gui/e-week-view.c (e_week_view_on_editing_stopped): commit the
+ sequence here also.
+ (e_week_view_add_event): s/abort_sequence/commit_sequence.
+
+ * gui/comp-util.c (cal_comp_event_new_with_current_time): don't
+ commit the sequence here.
+
2004-07-14 JP Rosevear <jpr@novell.com>
Fixes #61572
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 9da6b1bb30..0ee3e696bb 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -348,8 +348,6 @@ cal_comp_event_new_with_current_time (ECal *client, gboolean all_day)
e_cal_component_set_dtend (comp, &dt);
}
- e_cal_component_commit_sequence (comp);
-
return comp;
}
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 0be9d6f4ca..43715338d0 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -4124,7 +4124,7 @@ e_day_view_add_event (ECalComponent *comp,
event.comp_data = g_new0 (ECalModelComponent, 1);
event.comp_data->client = g_object_ref (e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (add_event_data->day_view))));
- e_cal_component_commit_sequence (comp);
+ e_cal_component_abort_sequence (comp);
event.comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
}
@@ -6045,6 +6045,7 @@ e_day_view_on_editing_stopped (EDayView *day_view,
summary.value = text;
summary.altrep = NULL;
e_cal_component_set_summary (comp, &summary);
+ e_cal_component_commit_sequence (comp);
if (!on_server) {
if (!e_cal_create_object (client, icalcomp, NULL, NULL))
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 6efaac9529..b3a5dbf7c7 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2419,7 +2419,7 @@ e_week_view_add_event (ECalComponent *comp,
event.comp_data = g_new0 (ECalModelComponent, 1);
event.comp_data->client = g_object_ref (e_cal_model_get_default_client (e_calendar_view_get_model (E_CALENDAR_VIEW (add_event_data->week_view))));
- e_cal_component_commit_sequence (comp);
+ e_cal_component_abort_sequence (comp);
event.comp_data->icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
}
event.start = start;
@@ -3329,6 +3329,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
summary.value = text;
summary.altrep = NULL;
e_cal_component_set_summary (comp, &summary);
+ e_cal_component_commit_sequence (comp);
if (!on_server) {
if (!e_cal_create_object (client, icalcomp, NULL, NULL))