Merging changes from BRANCH_1_0 to HEAD

1 files changed, 13 insertions, 1 deletions

diff --git a/libopie/pim/opimmainwindow.cpp b/libopie/pim/opimmainwindow.cpp
index 4044bc1..2739e26 100644
--- a/libopie/pim/opimmainwindow.cpp
+++ b/libopie/pim/opimmainwindow.cpp
@@ -6,2 +6,3 @@
 #include <qpe/qcopenvelope_qws.h>
+#include <qpe/qpeapplication.h>
 
@@ -40,2 +41,3 @@ void OPimMainWindow::doSetDocument( const QString&  ) {
 void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array ) {
+    bool needShow = false;
     /*
@@ -46,2 +48,3 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
     if ( cmd == "create()" ) {
+        raise();
         int uid = create();
@@ -49,2 +52,3 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         e << uid;
+        needShow = true;
     }else if ( cmd == "remove(int)" ) {
@@ -55,2 +59,3 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         e << rem;
+        needShow = true;
     }else if ( cmd == "beam(int)" ) {
@@ -60,2 +65,3 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
     }else if ( cmd == "show(int)" ) {
+        raise();
         int uid;
@@ -63,3 +69,5 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         show( uid );
+        needShow = true;
     }else if ( cmd == "edit(int)" ) {
+        raise();
         int uid;
@@ -77,2 +85,3 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
     }else if ( cmd == "alarm(QDateTime,int)" ) {
+        raise();
         QDateTime dt; int uid;
@@ -85,4 +94,7 @@ void OPimMainWindow::appMessage( const QCString& cmd, const QByteArray& array )
         doAlarm( dt,  uid );
-
+        needShow = true;
     }
+
+    if (needShow )
+        QPEApplication::setKeepRunning();
 }