author | mickeyl <mickeyl> | 2003-11-06 09:50:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 09:50:40 (UTC) |
commit | 2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe (patch) (unidiff) | |
tree | ab2089d9282c53146cd0e03b96345a34d74d156e /core/tools | |
parent | 26ae86ca1e42b61bd0f0031b437ed90a640aa82b (diff) | |
download | opie-2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe.zip opie-2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe.tar.gz opie-2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe.tar.bz2 |
merge core/tools/*
-rw-r--r-- | core/tools/quicklauncher/config.in | 4 | ||||
-rw-r--r-- | core/tools/quicklauncher/main.cpp | 22 | ||||
-rw-r--r-- | core/tools/quicklauncher/opie-quicklauncher.control | 10 |
3 files changed, 34 insertions, 2 deletions
diff --git a/core/tools/quicklauncher/config.in b/core/tools/quicklauncher/config.in new file mode 100644 index 0000000..c105e94 --- a/dev/null +++ b/core/tools/quicklauncher/config.in | |||
@@ -0,0 +1,4 @@ | |||
1 | config QUICKLAUNCHER | ||
2 | boolean "The Quick Launcher Loader" | ||
3 | default "y" | ||
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | ||
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index 7d368ab..cc411fd 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp | |||
@@ -23,9 +23,15 @@ | |||
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qguardedptr.h> | 24 | #include <qguardedptr.h> |
25 | #include <qcopchannel_qws.h> | 25 | #include <qcopchannel_qws.h> |
26 | #define QTOPIA_INTERNAL_INITAPP | 26 | #define QTOPIA_INTERNAL_INITAPP |
27 | |||
28 | #ifdef private | ||
29 | # undef private | ||
30 | #endif | ||
31 | #define private public | ||
27 | #include <qtopia/qpeapplication.h> | 32 | #include <qtopia/qpeapplication.h> |
33 | #undef private | ||
28 | #include <stdio.h> | 34 | #include <stdio.h> |
29 | #include <stdlib.h> | 35 | #include <stdlib.h> |
30 | #include <sys/types.h> | 36 | #include <sys/types.h> |
31 | #include <sys/stat.h> | 37 | #include <sys/stat.h> |
@@ -234,13 +240,25 @@ int main( int argc, char** argv ) | |||
234 | int rv = app->exec(); | 240 | int rv = app->exec(); |
235 | 241 | ||
236 | if ( mainWindow ) | 242 | if ( mainWindow ) |
237 | delete (QWidget*)mainWindow; | 243 | delete (QWidget*)mainWindow; |
244 | |||
245 | delete app; | ||
238 | if ( appIface ) | 246 | if ( appIface ) |
239 | loader->releaseInterface( appIface ); | 247 | loader->releaseInterface( appIface ); |
240 | delete loader; | 248 | delete loader; |
241 | 249 | // Neither QLibrary nor my Dropin is a QObject and they don't depend | |
242 | delete app; | 250 | // on a qApp so we destroy QWidget::destroyMapper() without |
251 | // crashing the app | ||
252 | // | ||
253 | // The problem is there are some 'static' resources not freed | ||
254 | // in the apps and on destructing these objects are not available | ||
255 | // anymore. In future fix up the apps but for now | ||
256 | // we just skip deletion and hope things go well -zecke | ||
257 | // delete app; | ||
258 | // hack instead -zecke | ||
259 | // delete app->pidChannel; | ||
260 | // app->pidChannel = 0; | ||
243 | 261 | ||
244 | return rv; | 262 | return rv; |
245 | } | 263 | } |
246 | 264 | ||
diff --git a/core/tools/quicklauncher/opie-quicklauncher.control b/core/tools/quicklauncher/opie-quicklauncher.control new file mode 100644 index 0000000..79b9493 --- a/dev/null +++ b/core/tools/quicklauncher/opie-quicklauncher.control | |||
@@ -0,0 +1,10 @@ | |||
1 | Package: opie-quicklauncher | ||
2 | Files: bin/quicklauncher | ||
3 | Priority: required | ||
4 | Section: opie/system | ||
5 | Maintainer: Trolltech (www.trolltech.com) | ||
6 | Architecture: arm | ||
7 | Version: $QPE_VERSION$EXTRAVERSION | ||
8 | Depends: | ||
9 | Description: Quick launcher stub | ||
10 | Launcher stub for quick launch enabled applications. | ||