From 73715315cdec0a538c2d6d6c3dea2f6423648951 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 17 May 2011 17:53:51 +0200 Subject: Bug #647785 - Pasting an 24h event in month and week view doesn't work --- calendar/gui/e-calendar-view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 68d2dccc5a..34f6eae6b0 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -636,7 +636,7 @@ clipboard_get_calendar_data (ECalendarView *cal_view, if (!text || !*text) return; - icalcomp = icalparser_parse_string ((const gchar *) text); + icalcomp = icalparser_parse_string (text); if (!icalcomp) return; @@ -1008,9 +1008,10 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart case GNOME_CAL_MONTH_VIEW: case GNOME_CAL_LIST_VIEW: if (old_dtstart.is_date && old_dtend.is_date - && memcmp (&ic_dur, &ic_oneday, sizeof (ic_dur)) == 0) + && memcmp (&ic_dur, &ic_oneday, sizeof (ic_dur)) == 0) { all_day_event = TRUE; - else { + new_dtstart = dtstart; + } else { icaltimetype new_time = icaltime_from_timet_with_zone (dtstart, FALSE, default_zone); new_time.hour = old_dtstart.hour; -- cgit v1.2.3