summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-17 22:49:32 (UTC)
committer zautrix <zautrix>2005-08-17 22:49:32 (UTC)
commita685e90ea183cba87e852d6f6272e54704034347 (patch) (unidiff)
treef773086786d564866c4d5b7ca08fb510ebf0eb0b
parentede1d2a3a3d772cabc54ec117006ec6f445485cc (diff)
downloadkdepimpi-a685e90ea183cba87e852d6f6272e54704034347.zip
kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.gz
kdepimpi-a685e90ea183cba87e852d6f6272e54704034347.tar.bz2
oops
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 898da6c..e3b62de 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3027,13 +3027,13 @@ void CalendarView::changeEventDisplay(Event *which, int action)
3027 if (which) { 3027 if (which) {
3028 // If there is an event view visible update the display 3028 // If there is an event view visible update the display
3029 mViewManager->currentView()->changeEventDisplay(which,action); 3029 mViewManager->currentView()->changeEventDisplay(which,action);
3030 // TODO: check, if update needed 3030 // TODO: check, if update needed
3031 // if (which->getTodoStatus()) { 3031 // if (which->getTodoStatus()) {
3032 mTodoList->updateView(); 3032 mTodoList->updateView();
3033 if ( action != KOGlobals::EVENTDELETED ) { 3033 if ( action != KOGlobals::EVENTDELETED && KOPrefs::instance()->mDetectConflicts ) {
3034 mConflictingEvent = which ; 3034 mConflictingEvent = which ;
3035 int time = 1000; 3035 int time = 1000;
3036#ifdef DESKTOP_VERSION 3036#ifdef DESKTOP_VERSION
3037 time = 500; 3037 time = 500;
3038#endif 3038#endif
3039 bool checkC = false; 3039 bool checkC = false;