author | mickeyl <mickeyl> | 2003-11-06 09:50:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 09:50:40 (UTC) |
commit | 2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe (patch) (side-by-side diff) | |
tree | ab2089d9282c53146cd0e03b96345a34d74d156e /core/tools/quicklauncher | |
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 @@ + config QUICKLAUNCHER + boolean "The Quick Launcher Loader" + default "y" + 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 @@ -15,25 +15,31 @@ ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include <qpainter.h> #include <qstrlist.h> #include <qtimer.h> #include <qguardedptr.h> #include <qcopchannel_qws.h> #define QTOPIA_INTERNAL_INITAPP + +#ifdef private +# undef private +#endif +#define private public #include <qtopia/qpeapplication.h> +#undef private #include <stdio.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> #include "dropins.h" static QPEApplication *app = 0; static PluginLoader *loader = 0; static ApplicationInterface *appIface = 0; static QGuardedPtr<QWidget> mainWindow; @@ -226,22 +232,34 @@ int main( int argc, char** argv ) QWidget *w = new QWidget(0,0,Qt::WDestructiveClose|Qt::WStyle_ContextHelp|Qt::WStyle_Tool); w->setGeometry( -100, -100, 10, 10 ); w->show(); QTimer::singleShot( 0, w, SLOT(close()) ); app->enter_loop(); } int rv = app->exec(); if ( mainWindow ) delete (QWidget*)mainWindow; + + delete app; if ( appIface ) loader->releaseInterface( appIface ); delete loader; - - delete app; + // Neither QLibrary nor my Dropin is a QObject and they don't depend + // on a qApp so we destroy QWidget::destroyMapper() without + // crashing the app + // + // The problem is there are some 'static' resources not freed + // in the apps and on destructing these objects are not available + // anymore. In future fix up the apps but for now + // we just skip deletion and hope things go well -zecke +// delete app; + // hack instead -zecke +// delete app->pidChannel; +// app->pidChannel = 0; return rv; } #include "main.moc" 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 @@ +Package: opie-quicklauncher +Files: bin/quicklauncher +Priority: required +Section: opie/system +Maintainer: Trolltech (www.trolltech.com) +Architecture: arm +Version: $QPE_VERSION$EXTRAVERSION +Depends: +Description: Quick launcher stub + Launcher stub for quick launch enabled applications. |