1 files changed, 11 insertions, 17 deletions

diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index c37813b..0a0d186 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -22,2 +22,6 @@
 
+#include <opie/odevice.h>
+
+using namespace Opie;
+
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
@@ -64,6 +68,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
     }
-
     setText( msg );
     connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
-    //  setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
@@ -77,3 +79,2 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 QString DateBookEvent::ampmTime( QTime tm ) {
-
     QString s;
@@ -94,3 +95,2 @@ QString DateBookEvent::ampmTime( QTime tm ) {
     }
-
 }
@@ -102,7 +102,9 @@ QString DateBookEvent::ampmTime( QTime tm ) {
 void DateBookEvent::editEventSlot( const Event &e ) {
-  startDatebook();
 
-  while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents();
-  QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
-  env << e.uid();
+    if ( ODevice::inst()->system() == System_Zaurus ) {
+        QCopEnvelope env( "QPE/Application/datebook", "raise()" );
+    } else {
+        QCopEnvelope env( "QPE/Datebook", "editEvent(int)" );
+        env << e.uid();
+    }
 }
@@ -110,12 +112,4 @@ void DateBookEvent::editEventSlot( const Event &e ) {
 
-/**
- * launches datebook
- */
-void DateBookEvent::startDatebook() {
-    QCopEnvelope e( "QPE/System", "execute(QString)" );
-    e << QString( "datebook" );
-}
-
 void DateBookEvent::editMe() {
-  emit editEvent( event.event() );
+    emit editEvent( event.event() );
 }