aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-05-17 23:53:51 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:16 +0800
commit73715315cdec0a538c2d6d6c3dea2f6423648951 (patch)
tree4b0837434768149765a2bd7f445ecc81cab75892 /calendar/gui
parent6ce10f6e28776e8dec026f1d422d68eadb44399d (diff)
downloadgsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar.gz
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar.bz2
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar.lz
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar.xz
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.tar.zst
gsoc2013-evolution-73715315cdec0a538c2d6d6c3dea2f6423648951.zip
Bug #647785 - Pasting an 24h event in month and week view doesn't work
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-calendar-view.c7
1 files 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;