| author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
| commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (side-by-side diff) | |
| tree | 7ef7f582eea8dee7ca1335b2e8748965e04cb8e6 /core/launcher/desktop.cpp | |
| parent | 50fc4807caa741b4bddf7c727273082a038d9760 (diff) | |
| download | opie-258feac229c2e8b5016670c1edc442e923c58628.zip opie-258feac229c2e8b5016670c1edc442e923c58628.tar.gz opie-258feac229c2e8b5016670c1edc442e923c58628.tar.bz2 | |
Revert the attempt to split calibrate, as it failed miserably.
| -rw-r--r-- | core/launcher/desktop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index ef0bf4c..6def126 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -98,6 +98,7 @@ static int loggedin = 0; static void login( bool at_poweron ) { if ( !loggedin ) { + Global::terminateBuiltin( "calibrate" ); Password::authenticate( at_poweron ); loggedin = 1; QCopEnvelope e( "QPE/Desktop", "unlocked()" ); @@ -621,6 +622,7 @@ void Desktop::executeOrModify( const QString& appLnkFile ) AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); if ( lnk.isValid() ) { QCString app = lnk.exec().utf8(); + Global::terminateBuiltin( "calibrate" ); if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { // MRUList::addTask( &lnk ); if ( hasVisibleWindow( app ) ) |