summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp14
-rw-r--r--core/launcher/serverapp.h4
2 files changed, 17 insertions, 1 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 11381e6..f7c2341 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -263,4 +263,5 @@ QPE_MEMALERTER_IMPL
263bool ServerApplication::doRestart = FALSE; 263bool ServerApplication::doRestart = FALSE;
264bool ServerApplication::allowRestart = TRUE; 264bool ServerApplication::allowRestart = TRUE;
265bool ServerApplication::ms_is_starting = TRUE;
265 266
266void ServerApplication::switchLCD( bool on ) { 267void ServerApplication::switchLCD( bool on ) {
@@ -285,5 +286,5 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
285 : QPEApplication( argc, argv, t ) 286 : QPEApplication( argc, argv, t )
286{ 287{
287 288 ms_is_starting = true;
288 289
289 // We know we'll have lots of cached pixmaps due to App/DocLnks 290 // We know we'll have lots of cached pixmaps due to App/DocLnks
@@ -847,4 +848,15 @@ ServerApplication *ServerApplication::me ( )
847} 848}
848 849
850bool ServerApplication::isStarting()
851{
852 return ms_is_starting;
853}
854
855int ServerApplication::exec()
856{
857 ms_is_starting = true;
858 qDebug("Serverapp - exec");
859 return QPEApplication::exec();
860}
849 861
850#include "serverapp.moc" 862#include "serverapp.moc"
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h
index fe3f24a..4d9f808 100644
--- a/core/launcher/serverapp.h
+++ b/core/launcher/serverapp.h
@@ -95,4 +95,6 @@ public:
95 static bool screenLocked(); 95 static bool screenLocked();
96 static void login(bool at_poweron); 96 static void login(bool at_poweron);
97
98 static bool isStarting();
97 99
98 static void switchLCD ( bool on ); // only for togglePower in Desktop 100 static void switchLCD ( bool on ); // only for togglePower in Desktop
@@ -100,4 +102,5 @@ public:
100 102
101 void restart(); 103 void restart();
104 int exec();
102 105
103signals: 106signals:
@@ -156,4 +159,5 @@ private:
156 bool m_screentap_sound : 1; 159 bool m_screentap_sound : 1;
157 bool m_alarm_sound : 1; 160 bool m_alarm_sound : 1;
161 static bool ms_is_starting;
158 162
159 163