- Qtopia 1.6 launcher merge (again - should be finished soon)

- Support for O-Menu applets (similiar to Taskbar applets)

1 files changed, 9 insertions, 2 deletions

diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 46bcdb3..7d1aaf1 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -193,2 +193,3 @@ void TaskBar::setStatusMessage( const QString &text )
 {
+    if ( !text.isEmpty() ) {
     label->setText( text );
@@ -197,3 +198,6 @@ void TaskBar::setStatusMessage( const QString &text )
   sysTray->hide();
-    clearer->start( 3000 );
+        clearer->start( 3000, TRUE );
+    } else {
+        clearStatusBar();
+    }
 }
@@ -214,3 +218,3 @@ void TaskBar::startWait()
 
-void TaskBar::stopWait(const QString& app)
+void TaskBar::stopWait(const QString& /*app*/)
 {
@@ -275,2 +279,4 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
                 inputMethods->loadInputMethods();
+        } else if ( msg == "reloadApps()" ) {
+                        sm->reloadApps();               
         } else if ( msg == "reloadApplets()" ) {
@@ -278,2 +284,3 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
                 sysTray->addApplets();
+                sm->reloadApplets();
         } else if ( msg == "soundAlarm()" ) {