[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 22:11:18
Message-ID: E1Vc0SU-0000HE-I7 () scm ! kde ! org
[Download RAW message or body]
Git commit e28ddf321d48e6bfd51b379cdec9a01112d159ed by Sergio Martins.
Committed on 31/10/2013 at 22:08.
Pushed by smartins into branch 'master'.
Merge branch 'KDE/4.11'
Conflicts:
akonadi/calendar/incidencechanger.cpp
akonadi/calendar/tests/itiphandlertest.cpp
M +28 -19 akonadi/calendar/incidencechanger.cpp
http://commits.kde.org/kdepimlibs/e28ddf321d48e6bfd51b379cdec9a01112d159ed
diff --cc akonadi/calendar/incidencechanger.cpp
index 01980a9,47d1f05..7d3ae9c
--- a/akonadi/calendar/incidencechanger.cpp
+++ b/akonadi/calendar/incidencechanger.cpp
@@@ -557,25 -568,34 +557,34 @@@ 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 ( newIncidence->supportsGroupwareCommunication() ) {
- if ( !neverSend && !alwaysSend && \
mInvitationStatusByAtomicOperation.contains( change->atomicOperationId ) ) \
{
- handler.setDefaultAction( actionFromStatus( \
mInvitationStatusByAtomicOperation.value( \
change->atomicOperationId ) ) );
- }
- const bool attendeeStatusChanged = myAttendeeStatusChanged( \
newIncidence,
- \
oldIncidence,
- \
Akonadi::CalendarUtils::allEmails() );
- ITIPHandlerHelper::SendResult status = \
handler.sendIncidenceModifiedMessage( \
KCalCore::iTIPRequest,
- \
newIncidence,
- \
attendeeStatusChanged );
-
- if ( change->atomicOperationId != 0 ) {
- mInvitationStatusByAtomicOperation.insert( \
change->atomicOperationId, status );
- }
- }
+ if ( change->originalItems.isEmpty() ) {
+ break;
+ }
+
+ Q_ASSERT( change->originalItems.count() == 1 );
+ Incidence::Ptr oldIncidence = CalendarUtils::incidence( \
change->originalItems.first() ); + Incidence::Ptr newIncidence = \
CalendarUtils::incidence( change->newItem ); +
+ if ( !newIncidence->supportsGroupwareCommunication() ||
+ !Akonadi::CalendarUtils::thatIsMe( \
newIncidence->organizer()->email() ) ) { + // If we're not the \
organizer, the user already saw the "Do you really want to do this, \
incidence will become out of sync" + break;
+ }
+
- if ( mInvitationStatusByAtomicOperation.contains( \
change->atomicOperationId ) ) { ++ if ( !neverSend && !alwaysSend && \
mInvitationStatusByAtomicOperation.contains( change->atomicOperationId ) ) \
{ + handler.setDefaultAction( actionFromStatus( \
mInvitationStatusByAtomicOperation.value( change->atomicOperationId ) ) ); \
+ } +
+ const bool attendeeStatusChanged = myAttendeeStatusChanged( \
newIncidence, + \
oldIncidence, + \
Akonadi::CalendarUtils::allEmails() ); +
+ ITIPHandlerHelper::SendResult status = \
handler.sendIncidenceModifiedMessage( KCalCore::iTIPRequest, + \
newIncidence, + \
attendeeStatusChanged ); +
+ if ( change->atomicOperationId != 0 ) {
+ mInvitationStatusByAtomicOperation.insert( \
change->atomicOperationId, status ); }
}
break;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic