Merging changes from BRANCH_1_0 to HEAD

1 files changed, 13 insertions, 1 deletions

diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 4044bc1..2739e26 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -5,4 +5,5 @@
 #include <qpe/sound.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
 #include "opimresolver.h"
@@ -39,4 +40,5 @@ void OPimMainWindow::doSetDocument( const QString&  ) {
 }
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
+    bool needShow = false;
     /*
      * create demands to create
@@ -45,7 +47,9 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
     QDataStream stream(array, IO_ReadOnly);
     if ( cmd == "create()" ) {
+        raise();
         int uid = create();
         QCopEnvelope e(m_str, "created(int)" );
         e << uid;
+        needShow = true;
     }else if ( cmd == "remove(int)" ) {
         int uid;
@@ -54,4 +58,5 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         QCopEnvelope e(m_str, "removed(bool)" );
         e << rem;
+        needShow = true;
     }else if ( cmd == "beam(int)" ) {
         int uid;
@@ -59,8 +64,11 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         beam( uid);
     }else if ( cmd == "show(int)" ) {
+        raise();
         int uid;
         stream >> uid;
         show( uid );
+        needShow = true;
     }else if ( cmd == "edit(int)" ) {
+        raise();
         int uid;
         stream >> uid;
@@ -76,4 +84,5 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         delete m_fallBack;
     }else if ( cmd == "alarm(QDateTime,int)" ) {
+        raise();
         QDateTime dt; int uid;
         stream >> dt;
@@ -84,6 +93,9 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
             return;
         doAlarm( dt,  uid );
-
+        needShow = true;
     }
+
+    if (needShow )
+        QPEApplication::setKeepRunning();
 }
 /* implement the url scripting here */