3 files changed, 19 insertions, 16 deletions

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 3b2a276..af97ee9 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -143,7 +143,6 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
   connect(mEndDateEdit, SIGNAL(dateChanged(QDate)),
 	  this, SLOT(endDateChanged(QDate)));
-  connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime)));
-  connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),mEndTimeEdit,SLOT(setTime(QTime)));
-
+  connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(sTimeChanged(QTime)));
+  connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(eTimeChanged(QTime)));
 }
 
@@ -197,14 +196,23 @@ void KOEditorGeneralEvent::setDateTimes(QDateTime start, QDateTime end)
 }
 
+void KOEditorGeneralEvent::sTimeChanged(QTime ti)
+{
+    mStartTimeEdit->setTime( ti );
+    startTimeChanged ( ti);
+}
+void KOEditorGeneralEvent::eTimeChanged(QTime ti )
+{
+    mEndTimeEdit->setTime( ti );
+    endTimeChanged( ti );
+}
 void KOEditorGeneralEvent::startTimeChanged(QTime newtime)
 {
-  kdDebug() << "KOEditorGeneralEvent::startTimeChanged() " << newtime.toString() << endl;
 
   int secsep = mCurrStartDateTime.secsTo(mCurrEndDateTime);
 
-  mCurrStartDateTime.setTime(newtime);
-
+  mCurrStartDateTime = QDateTime( mStartDateEdit->date(), QTime(newtime.hour(),newtime.minute(),0) );
   // adjust end time so that the event has the same duration as before.
-  mCurrEndDateTime = mCurrStartDateTime.addSecs(secsep);
+  if( secsep > 0 )
+      mCurrEndDateTime = mCurrStartDateTime.addSecs(secsep);
   mEndTimeEdit->setTime(mCurrEndDateTime.time());
   mEndDateEdit->setDate(mCurrEndDateTime.date());
@@ -215,8 +223,6 @@ void KOEditorGeneralEvent::startTimeChanged(QTime newtime)
 void KOEditorGeneralEvent::endTimeChanged(QTime newtime)
 {
-//  kdDebug() << "KOEditorGeneralEvent::endTimeChanged " << newtime.toString() << endl;
 
-  QDateTime newdt(mCurrEndDateTime.date(), newtime);
-  mCurrEndDateTime = newdt;
+  mCurrEndDateTime =  QDateTime ( mEndDateEdit->date(), QTime(newtime.hour(),newtime.minute(),0));
 
   emit dateTimesChanged(mCurrStartDateTime,mCurrEndDateTime);
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 0174788..9649806 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -84,4 +84,6 @@ class KOEditorGeneralEvent : public KOEditorGeneral
 
     void emitDateTimeStr();
+    void sTimeChanged(QTime);
+    void eTimeChanged(QTime);
 
   signals:
diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp
index baa11b5..e5ff8af 100644
--- a/korganizer/koeventviewerdialog.cpp
+++ b/korganizer/koeventviewerdialog.cpp
@@ -217,8 +217,5 @@ void KOEventViewerDialog::editIncidence()
     }
     if ( mIncidence ){
-#ifndef DESKTOP_VERSION
-        //hide();
         close();
-#endif
         emit editIncidence( mIncidence );
     }
@@ -255,7 +252,5 @@ void KOEventViewerDialog::showIncidence()
             emit jumpToTime( date );
         }
-#ifndef DESKTOP_VERSION
-        reject();
-#endif
+        close();
     }
 }