From 258feac229c2e8b5016670c1edc442e923c58628 Mon Sep 17 00:00:00 2001
From: kergoth <kergoth>
Date: Sun, 20 Apr 2003 21:49:11 +0000
Subject: Revert the attempt to split calibrate, as it failed miserably.

---
(limited to 'core/launcher/desktop.cpp')

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 ) )
--
cgit v0.9.0.2