diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2001-07-31 19:15:18 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2001-07-31 19:15:18 +0800 |
| commit | 50d1ebd64aeec09a01ddc3e89185ac61a16e8702 (patch) | |
| tree | 33482c6aa35233b8683bea69053d022da1726b0e | |
| parent | d6f73cd6345e20806223ea48eee0393f429dde84 (diff) | |
| download | gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar.gz gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar.bz2 gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar.lz gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar.xz gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.tar.zst gsoc2013-evolution-50d1ebd64aeec09a01ddc3e89185ac61a16e8702.zip | |
don't set the end date for the pasted components, since it will be
2001-07-31 Rodrigo Moya <rodrigo@ximian.com>
* gui/e-day-view.c (selection_received):
* gui/e-week-view.c (selection_received): don't set the end date
for the pasted components, since it will be recalculated when the start
date is set, thus keeping the same duration than the original
cut/copied component. Fixes #5836
svn path=/trunk/; revision=11509
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-day-view.c | 8 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 11 |
3 files changed, 9 insertions, 18 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8a50c4e6c4..42e22fc813 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2001-07-31 Rodrigo Moya <rodrigo@ximian.com> + + * gui/e-day-view.c (selection_received): + * gui/e-week-view.c (selection_received): don't set the end date + for the pasted components, since it will be recalculated when the start + date is set, thus keeping the same duration than the original + cut/copied component. Fixes #5836 + 2001-07-30 Damon Chaplin <damon@ximian.com> * gui/gnome-cal.c: diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index ca12b87176..4da82c61a5 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -6722,10 +6722,6 @@ selection_received (GtkWidget *invisible, /* FIXME: Need to set TZID. */ icalcomponent_set_dtstart (icalcomp, itime); - itime = icaltime_from_timet_with_zone (dtend, FALSE, day_view->zone); - /* FIXME: Need to set TZID. */ - icalcomponent_set_dtend (icalcomp, itime); - uid = cal_component_gen_uid (); tmp_comp = cal_component_new (); cal_component_set_icalcomponent ( @@ -6755,10 +6751,6 @@ selection_received (GtkWidget *invisible, /* FIXME: Need to set TZID. */ icalcomponent_set_dtstart (icalcomp, itime); - itime = icaltime_from_timet_with_zone (dtend, FALSE, day_view->zone); - /* FIXME: Need to set TZID. */ - icalcomponent_set_dtend (icalcomp, itime); - comp = cal_component_new (); cal_component_set_icalcomponent (comp, icalcomp); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 9fbf7cb660..2e5d2d72e6 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3586,7 +3586,7 @@ selection_received (GtkWidget *invisible, { char *comp_str; icalcomponent *icalcomp; - time_t dtstart, dtend; + time_t dtstart; struct icaltimetype itime; icalcomponent_kind kind; CalComponent *comp; @@ -3614,7 +3614,6 @@ selection_received (GtkWidget *invisible, } dtstart = week_view->day_starts[week_view->selection_start_day]; - dtend = week_view->day_starts[week_view->selection_end_day + 1]; if (kind == ICAL_VCALENDAR_COMPONENT) { int num_found = 0; @@ -3634,10 +3633,6 @@ selection_received (GtkWidget *invisible, /* FIXME: Need to set TZID. */ icalcomponent_set_dtstart (icalcomp, itime); - itime = icaltime_from_timet_with_zone (dtend, FALSE, week_view->zone); - /* FIXME: Need to set TZID. */ - icalcomponent_set_dtend (icalcomp, itime); - uid = cal_component_gen_uid (); tmp_comp = cal_component_new (); cal_component_set_icalcomponent ( @@ -3667,10 +3662,6 @@ selection_received (GtkWidget *invisible, /* FIXME: need to set TZID */ icalcomponent_set_dtstart (icalcomp, itime); - itime = icaltime_from_timet_with_zone (dtend, FALSE, week_view->zone); - /* FIXME: need to set TZID */ - icalcomponent_set_dtend (icalcomp, itime); - comp = cal_component_new (); cal_component_set_icalcomponent (comp, icalcomp); uid = cal_component_gen_uid (); |