summaryrefslogtreecommitdiff
authorzecke <zecke>2003-09-30 08:22:29 (UTC)
committer zecke <zecke>2003-09-30 08:22:29 (UTC)
commit5430b226e390cc9af6a3257d6998e34bf806c9e2 (patch) (unidiff)
tree3a1e3ad2087157c5d95574f2b2a5d09ed68f65d5
parentc638bdc2b6ff6a18ec851f4317629b9d3eed4d7b (diff)
downloadopie-5430b226e390cc9af6a3257d6998e34bf806c9e2.zip
opie-5430b226e390cc9af6a3257d6998e34bf806c9e2.tar.gz
opie-5430b226e390cc9af6a3257d6998e34bf806c9e2.tar.bz2
Only send local QCOP Requests when you've inserted the event loop because
only at this point they will be delivered right ( slots connected to the signals ) Needs a backport!!!!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 86aa53d..4d0b0ea 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -98,7 +98,7 @@ public:
98 QPEApplicationData ( ) 98 QPEApplicationData ( )
99 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ), 99 : presstimer( 0 ), presswidget( 0 ), rightpressed( false ), kbgrabbed( false ),
100 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ), 100 notbusysent( false ), preloaded( false ), forceshow( false ), nomaximize( false ),
101 keep_running( true ), qpe_main_widget( 0 ) 101 keep_running( true ), qpe_main_widget( 0 ), qcopQok( false )
102 102
103 { 103 {
104 qcopq.setAutoDelete( TRUE ); 104 qcopq.setAutoDelete( TRUE );
@@ -114,8 +114,10 @@ public:
114 bool preloaded : 1; 114 bool preloaded : 1;
115 bool forceshow : 1; 115 bool forceshow : 1;
116 bool nomaximize : 1; 116 bool nomaximize : 1;
117 bool qcopQok : 1;
117 bool keep_running : 1; 118 bool keep_running : 1;
118 119
120
119 QStringList langs; 121 QStringList langs;
120 QString appName; 122 QString appName;
121 struct QCopRec 123 struct QCopRec
@@ -142,6 +144,9 @@ public:
142 } 144 }
143 void sendQCopQ() 145 void sendQCopQ()
144 { 146 {
147 if (!qcopQok )
148 return;
149
145 QCopRec * r; 150 QCopRec * r;
146#ifndef QT_NO_COP 151#ifndef QT_NO_COP
147 152
@@ -1893,6 +1898,7 @@ void QPEApplication::grabKeyboard()
1893*/ 1898*/
1894int QPEApplication::exec() 1899int QPEApplication::exec()
1895{ 1900{
1901 d->qcopQok = true;
1896#ifndef QT_NO_COP 1902#ifndef QT_NO_COP
1897 d->sendQCopQ(); 1903 d->sendQCopQ();
1898#endif 1904#endif