| author | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-08-24 18:38:31 (UTC) |
| commit | 2cde25d8061acd536bccd698722952ce8555f5db (patch) (side-by-side diff) | |
| tree | 70f905e5de57b44c3503883b2f98925d9c92ef8b /korganizer/kodaymatrix.cpp | |
| parent | 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff) | |
| download | kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2 | |
conflict res fix
| -rw-r--r-- | korganizer/kodaymatrix.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 057df0d..7076e05 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -459,4 +459,7 @@ void KODayMatrix::updateViewTimed() continue; } + if ( !KOPrefs::instance()->mLongAllday && event->doesFloat()&& event->isMultiDay() ) { + continue; + } if ( event->doesRecur() ) { bool last; @@ -685,4 +688,7 @@ void KODayMatrix::updateEvents() numEvents--; } + if ( !KOPrefs::instance()->mLongAllday && event->doesFloat()&& event->isMultiDay() ) { + numEvents--; + } } if ( numEvents ) |