summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-07 22:42:31 (UTC)
committer zautrix <zautrix>2005-07-07 22:42:31 (UTC)
commit9635c9a7b8f5c19a1784079d4b67cb3ca600fc33 (patch) (side-by-side diff)
tree55a23c20f4092409a1dd2c34cecf6bdb7341a04b /korganizer
parent876816e6582299d527610e847d259d2be6de403c (diff)
downloadkdepimpi-9635c9a7b8f5c19a1784079d4b67cb3ca600fc33.zip
kdepimpi-9635c9a7b8f5c19a1784079d4b67cb3ca600fc33.tar.gz
kdepimpi-9635c9a7b8f5c19a1784079d4b67cb3ca600fc33.tar.bz2
fixxx
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2582931..68d1bc6 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2749,3 +2749,3 @@ void CalendarView::checkConflictForEvent()
if ( ! mConflictingEvent ) return;
- if ( mConflictingEvent->doesFloat() ) {
+ if ( mConflictingEvent->isHoliday() || mConflictingEvent->isBirthday() || mConflictingEvent->isAnniversary() ) {
mConflictingEvent = 0;
@@ -2791,5 +2791,4 @@ void CalendarView::checkConflictForEvent()
topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
- return;
}
-
+ mConflictingEvent = 0;
return;