aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/e-calendar-view.c11
2 files changed, 16 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 0769f9eb1e..9c1c6e406c 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-01 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #301391
+ * gui/e-calendar-view.c: (clipboard_get_text_cb):
+ Remove the X-EVOLUTION-ENDDATE property, so that
+ the copy/paste of recurrence event expands properly in
+ the view.
2005-10-01 P. S. Chakravarthi <pchakravarthi@novell.com>
Fixes #269685
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 9292e27636..cfc9d755a2 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -812,10 +812,17 @@ clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarView
subcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
while (subcomp) {
child_kind = icalcomponent_isa (subcomp);
- if (child_kind == ICAL_VEVENT_COMPONENT)
+ if (child_kind == ICAL_VEVENT_COMPONENT) {
+
+ if (e_cal_util_component_has_recurrences (subcomp)) {
+ icalproperty *icalprop = icalcomponent_get_first_property (subcomp, ICAL_RRULE_PROPERTY);
+ if (icalprop)
+ icalproperty_remove_parameter_by_name (icalprop, "X-EVOLUTION-ENDDATE");
+ }
+
e_calendar_view_add_event (cal_view, client, selected_time_start,
default_zone, subcomp, in_top_canvas);
- else if (child_kind == ICAL_VTIMEZONE_COMPONENT) {
+ } else if (child_kind == ICAL_VTIMEZONE_COMPONENT) {
icaltimezone *zone;
zone = icaltimezone_new ();