diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-18 18:48:46 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-08-18 18:48:46 +0000 |
commit | b40645d109f976df2c54ecaf3851f3d90138bb8b (patch) | |
tree | 33e80bfc8c8ea426da92b9579f2c033d9b312df5 /korganizer/incidencechanger.cpp | |
parent | 740cad9fc10cc4e3683b619cbe06da24ef18f1b0 (diff) | |
download | tdepim-b40645d109f976df2c54ecaf3851f3d90138bb8b.tar.gz tdepim-b40645d109f976df2c54ecaf3851f3d90138bb8b.zip |
Fixed a number of issues, including
* event modification and view refresh when GroupWare communication is disabled
* Deletion (delay) of first recurring event
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1165287 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/incidencechanger.cpp')
-rw-r--r-- | korganizer/incidencechanger.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 92332578c..46be25ba7 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -118,8 +118,8 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence-> scheduler.performTransaction( tmp, Scheduler::Reply ); } } - emit incidenceDeleted( incidence ); } + emit incidenceDeleted( incidence ); return doDelete; } @@ -298,14 +298,15 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<<newinc->sum KCal::Scheduler::Request, newinc, false, statusChanged ) ) { // Accept the event changes - if ( action<0 ) { - emit incidenceChanged( oldinc, newinc ); - } else { - emit incidenceChanged( oldinc, newinc, action ); - } revert = false; } + if ( action<0 ) { + emit incidenceChanged( oldinc, newinc ); + } else { + emit incidenceChanged( oldinc, newinc, action ); + } + if ( revert ) { assignIncidence( newinc, oldinc ); return false; |