summaryrefslogtreecommitdiffabout
path: root/korganizer/calendarview.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/calendarview.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9674921..3ab4bb4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -745,3 +745,3 @@ void CalendarView::nextConflict( bool all, bool allday )
topLevelWidget()->setCaption( i18n("No conflict found") );
- qDebug("No conflict found ");
+ //qDebug("No conflict found ");
block = false;
@@ -2830,2 +2830,3 @@ void CalendarView::checkConflictForEvent()
}
+ topLevelWidget()->setCaption( i18n("KO/Pi") );
if ( found ) {
@@ -2835,5 +2836,5 @@ void CalendarView::checkConflictForEvent()
i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
- if ( km != KMessageBox::Continue )
+ if ( km != KMessageBox::Continue ) {
return;
-
+ }
if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )