less qcop trouble on retial rom

5 files changed, 15 insertions, 26 deletions

diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index eb2496a..93abdcb 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -2,4 +2,6 @@
 
 * refresh settings
+* only launch datebook config when clicked on a date ( opie only )
+* less qcop trouble on sharps retail rom 
 
 0.5.1
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 615059a..0bbdb77 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -1,6 +1,5 @@
 TEMPLATE = lib
 CONFIG -= moc
-CONFIG += qt debug
-
+CONFIG += qt release
 # Input
 HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \
@@ -14,5 +13,5 @@ DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopie 
 
 DESTDIR = $(OPIEDIR)/plugins/today
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
@@ -21,4 +21,8 @@
 #include <qpe/qpeapplication.h>
 
+#include <opie/odevice.h>
+
+using namespace Opie;
+
 DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
                              QWidget* parent,
@@ -63,8 +67,6 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
         msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
     }
-
     setText( msg );
     connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
-    //  setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
@@ -76,5 +78,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
  */
 QString DateBookEvent::ampmTime( QTime tm ) {
-
     QString s;
     if( ampm ) {
@@ -93,5 +94,4 @@ QString DateBookEvent::ampmTime( QTime tm ) {
         return s;
     }
-
 }
 
@@ -101,22 +101,16 @@ 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();
+    }
 }
 
 
-/**
- * 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() );
 }
 
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index 61c64f1..7b0371a 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -40,5 +40,4 @@ private slots:
     void editMe();
 private:
-    void startDatebook();
     DateBookDB *db;
     QString ampmTime(QTime);
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index 7948656..a8ce059 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -108,9 +108,4 @@ void DatebookPluginWidget::getDates() {
         layoutDates->addWidget( noEvents );
     }
-    //layoutDates->addStretch(0);
-//     layoutDates->addItem( new QSpacerItem( 1,1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
-
-    // how often refresh - later have qcop update calls in *db
-    //QTimer::singleShot( 20*1000, this  , SLOT( getDates() ) );
 }