summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeventviewerdialog.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index 1dce841..baa11b5 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -230,15 +230,12 @@ void KOEventViewerDialog::showIncidence()
mSyncResult = 1;
accept();
return;
}
if ( mIncidence ){
-#ifndef DESKTOP_VERSION
- hide();
-#endif
QDate date;
if ( mIncidence->type() == "Todo" ) {
/*
if ( ((Todo*)mIncidence)->hasDueDate() )
date = ((Todo*)mIncidence)->dtDue().date();
else {
@@ -246,22 +243,23 @@ void KOEventViewerDialog::showIncidence()
emit showAgendaView( false );
return;
}
*/
((Todo*)mIncidence)->setCompleted( true );
((Todo*)mIncidence)->setCompleted(QDateTime::currentDateTime() );
- hide();
emit todoCompleted(((Todo*)mIncidence));
- return;
-
- } else
+ } else {
date = mIncidence->dtStart().date();
- globalFlagBlockAgenda = 1;
- emit showAgendaView( false );
- globalFlagBlockAgenda = 2;
- emit jumpToTime( date );
+ globalFlagBlockAgenda = 1;
+ emit showAgendaView( false );
+ globalFlagBlockAgenda = 2;
+ emit jumpToTime( date );
+ }
+#ifndef DESKTOP_VERSION
+ reject();
+#endif
}
}
void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e )
{
switch ( e->key() ) {