From kde-commits  Thu Oct 31 23:29:54 2013
From: Sergio Martins <iamsergio () gmail ! com>
Date: Thu, 31 Oct 2013 23:29:54 +0000
To: kde-commits
Subject: [kdepimlibs] akonadi/calendar: Merge branch 'KDE/4.11'
Message-Id: <E1Vc1gY-0005EE-SQ () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138326220508852

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() =3D=3D 1 );
-           Incidence::Ptr oldIncidence =3D CalendarUtils::incidence( chang=
e->originalItems.first() );
-           Incidence::Ptr newIncidence =3D CalendarUtils::incidence( chang=
e->newItem );
- =

-           if ( oldIncidence->supportsGroupwareCommunication() ) {
-             const bool modify =3D handler.handleIncidenceAboutToBeModifie=
d( newIncidence );
-             if ( !modify ) {
-               if ( newIncidence->type() =3D=3D oldIncidence->type() ) {
-                 IncidenceBase *i1 =3D newIncidence.data();
-                 IncidenceBase *i2 =3D oldIncidence.data();
-                 *i1 =3D *i2;
-               }
-               result =3D false;
-             }
-           }
+         if ( change->originalItems.isEmpty() ) {
+           break;
+         }
+ =

+         Q_ASSERT( change->originalItems.count() =3D=3D 1 );
 -        Incidence::Ptr oldIncidence =3D change->originalItems.first().pay=
load<KCalCore::Incidence::Ptr>();
 -        Incidence::Ptr newIncidence =3D change->newItem.payload<KCalCore:=
:Incidence::Ptr>();
++        Incidence::Ptr oldIncidence =3D CalendarUtils::incidence( change-=
>originalItems.first() );
++        Incidence::Ptr newIncidence =3D CalendarUtils::incidence( change-=
>newItem );
+ =

+         if ( !oldIncidence->supportsGroupwareCommunication() ) {
+           break;
+         }
+ =

+         const bool modify =3D handler.handleIncidenceAboutToBeModified( n=
ewIncidence );
+         if ( modify ) {
+           break;
          }
+ =

+         if ( newIncidence->type() =3D=3D oldIncidence->type() ) {
+           IncidenceBase *i1 =3D newIncidence.data();
+           IncidenceBase *i2 =3D oldIncidence.data();
+           *i1 =3D *i2;
+         }
+         result =3D false;
        }
        break;
        default: