[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/KDE/4.11] calendarviews/agenda: Fix modifying events from/to allday.
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2013-09-30 16:52:44
Message-ID: E1VQgiC-0001N5-HW () scm ! kde ! org
[Download RAW message or body]

Git commit 45da049a04c17380499e52a17507fb350798da32 by Sergio Martins.
Committed on 30/09/2013 at 16:50.
Pushed by smartins into branch 'KDE/4.11'.

Fix modifying events from/to allday.

When the all day property changes to false, the incidence wasn't being
found because we were looking in the wrong agenda.

M  +4    -5    calendarviews/agenda/agendaview.cpp

http://commits.kde.org/kdepim/45da049a04c17380499e52a17507fb350798da32

diff --git a/calendarviews/agenda/agendaview.cpp b/calendarviews/agenda/agendaview.cpp
index 216071d..7ba033b 100644
--- a/calendarviews/agenda/agendaview.cpp
+++ b/calendarviews/agenda/agendaview.cpp
@@ -2104,11 +2104,10 @@ void AgendaView::deleteSelectedDateTime()
 
 void AgendaView::removeIncidence( const KCalCore::Incidence::Ptr &incidence )
 {
-  if ( incidence->allDay() ) {
-    d->mAllDayAgenda->removeIncidence( incidence );
-  } else {
-    d->mAgenda->removeIncidence( incidence );
-  }
+  // Don't wrap this in a if ( incidence->isAllDay ) because whe all day
+  // property might have changed
+  d->mAllDayAgenda->removeIncidence( incidence );
+  d->mAgenda->removeIncidence( incidence );
 
   if ( !incidence->hasRecurrenceId() ) {
     KCalCore::Incidence::List exceptions = calendar()->instances( incidence );
[prev in list] [next in list] [prev in thread] [next in thread]