From kde-commits Tue Jul 31 21:58:28 2012 From: Sergio Martins Date: Tue, 31 Jul 2012 21:58:28 +0000 To: kde-commits Subject: [kdepimlibs/calendaring] akonadi/calendar: Call the invitation code. Message-Id: <20120731215828.728EFA6094 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=134377218704637 Git commit a6036bf725f32664c735d6518ee3055f1a62a6d8 by Sergio Martins. Committed on 31/07/2012 at 23:55. Pushed by smartins into branch 'calendaring'. Call the invitation code. M +7 -0 akonadi/calendar/incidencechanger.cpp http://commits.kde.org/kdepimlibs/a6036bf725f32664c735d6518ee3055f1a62a6d8 diff --git a/akonadi/calendar/incidencechanger.cpp b/akonadi/calendar/incid= encechanger.cpp index 1da6ab0..fb94e57 100644 --- a/akonadi/calendar/incidencechanger.cpp +++ b/akonadi/calendar/incidencechanger.cpp @@ -311,6 +311,7 @@ void IncidenceChanger::Private::handleCreateJobResult( = KJob *job ) Q_ASSERT( item.isValid() ); Q_ASSERT( item.hasPayload() ); change->newItem =3D item; + handleInvitationsAfterChange( change ); // for user undo/redo if ( change->recordToHistory ) { mHistory->recordCreation( item, description, change->atomicOperation= Id ); @@ -625,6 +626,8 @@ int IncidenceChanger::createIncidence( const Incidence:= :Ptr &incidence, return changeId; } = + d->handleInvitationsBeforeChange( change ); + if ( collection.isValid() && d->hasRights( collection, ChangeTypeCreate = ) ) { // The collection passed always has priority collectionToUse =3D collection; @@ -769,6 +772,8 @@ int IncidenceChanger::deleteIncidences( const Item::Lis= t &items, QWidget *parent return changeId; } = + d->handleInvitationsBeforeChange( change ); + Item::List itemsToDelete; foreach( const Item &item, items ) { if ( d->deleteAlreadyCalled( item.id() ) ) { @@ -912,6 +917,8 @@ void IncidenceChanger::Private::performModification( Ch= ange::Ptr change ) return; } = + handleInvitationsBeforeChange( change ); + QHash &latestRevisionByItemId =3D ConflictPreventer::self()= ->mLatestRevisionByItemId; if ( latestRevisionByItemId.contains( id ) &&