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

List:       kde-commits
Subject:    [kdepimlibs] akonadi/calendar: Merge branch 'KDE/4.11'
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2013-10-31 23:29:54
Message-ID: E1Vc1gY-0005EE-SQ () scm ! kde ! org
[Download RAW message or body]

Git commit 1dc326b27dd951f135f9878334dd0de6e76d0f62 by Sergio Martins.
Committed on 31/10/2013 at 23:29.
Pushed by smartins into branch 'master'.

Merge branch 'KDE/4.11'

Conflicts:
	akonadi/calendar/incidencechanger.cpp

M  +29   -17   akonadi/calendar/incidencechanger.cpp

http://commits.kde.org/kdepimlibs/1dc326b27dd951f135f9878334dd0de6e76d0f62

diff --cc akonadi/calendar/incidencechanger.cpp
index 7d3ae9c,5233548..f7a28de
--- a/akonadi/calendar/incidencechanger.cpp
+++ b/akonadi/calendar/incidencechanger.cpp
@@@ -457,23 -479,29 +457,29 @@@ bool IncidenceChanger::Private::handleI
        break;
        case IncidenceChanger::ChangeTypeModify:
        {
-         if ( !change->originalItems.isEmpty() ) {
-           Q_ASSERT( change->originalItems.count() == 1 );
-           Incidence::Ptr oldIncidence = CalendarUtils::incidence( \
                change->originalItems.first() );
-           Incidence::Ptr newIncidence = CalendarUtils::incidence( change->newItem \
                );
- 
-           if ( oldIncidence->supportsGroupwareCommunication() ) {
-             const bool modify = handler.handleIncidenceAboutToBeModified( \
                newIncidence );
-             if ( !modify ) {
-               if ( newIncidence->type() == oldIncidence->type() ) {
-                 IncidenceBase *i1 = newIncidence.data();
-                 IncidenceBase *i2 = oldIncidence.data();
-                 *i1 = *i2;
-               }
-               result = false;
-             }
-           }
+         if ( change->originalItems.isEmpty() ) {
+           break;
+         }
+ 
+         Q_ASSERT( change->originalItems.count() == 1 );
 -        Incidence::Ptr oldIncidence = \
                change->originalItems.first().payload<KCalCore::Incidence::Ptr>();
 -        Incidence::Ptr newIncidence = \
change->newItem.payload<KCalCore::Incidence::Ptr>(); ++        Incidence::Ptr \
oldIncidence = CalendarUtils::incidence( change->originalItems.first() ); ++        \
Incidence::Ptr newIncidence = CalendarUtils::incidence( change->newItem ); + 
+         if ( !oldIncidence->supportsGroupwareCommunication() ) {
+           break;
+         }
+ 
+         const bool modify = handler.handleIncidenceAboutToBeModified( newIncidence \
); +         if ( modify ) {
+           break;
          }
+ 
+         if ( newIncidence->type() == oldIncidence->type() ) {
+           IncidenceBase *i1 = newIncidence.data();
+           IncidenceBase *i2 = oldIncidence.data();
+           *i1 = *i2;
+         }
+         result = false;
        }
        break;
        default:


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