summaryrefslogtreecommitdiff
path: root/core/launcher/desktop.cpp
authorkergoth <kergoth>2003-04-19 22:07:06 (UTC)
committer kergoth <kergoth>2003-04-19 22:07:06 (UTC)
commit29c556ffc9b1497cd996ceb46d646b1eaf1288be (patch) (unidiff)
treeb89c424de93f541bc80908c93172eb4e601e8c02 /core/launcher/desktop.cpp
parentc502394063598e63591e06072802f1c5a9e0c266 (diff)
downloadopie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.zip
opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.gz
opie-29c556ffc9b1497cd996ceb46d646b1eaf1288be.tar.bz2
Split calibrate out as a standalone application, and ensure taskbar depends
on it. This makes ts debugging easier, having a seperate calibration tool around, and as a side affect fixes calibration on the C700, which previously required a reboot to take effect.
Diffstat (limited to 'core/launcher/desktop.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 6def126..ef0bf4c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -98,7 +98,6 @@ static int loggedin = 0;
98static void login( bool at_poweron ) 98static void login( bool at_poweron )
99{ 99{
100 if ( !loggedin ) { 100 if ( !loggedin ) {
101 Global::terminateBuiltin( "calibrate" );
102 Password::authenticate( at_poweron ); 101 Password::authenticate( at_poweron );
103 loggedin = 1; 102 loggedin = 1;
104 QCopEnvelope e( "QPE/Desktop", "unlocked()" ); 103 QCopEnvelope e( "QPE/Desktop", "unlocked()" );
@@ -622,7 +621,6 @@ void Desktop::executeOrModify( const QString& appLnkFile )
622 AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); 621 AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile );
623 if ( lnk.isValid() ) { 622 if ( lnk.isValid() ) {
624 QCString app = lnk.exec().utf8(); 623 QCString app = lnk.exec().utf8();
625 Global::terminateBuiltin( "calibrate" );
626 if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { 624 if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) {
627 // MRUList::addTask( &lnk ); 625 // MRUList::addTask( &lnk );
628 if ( hasVisibleWindow( app ) ) 626 if ( hasVisibleWindow( app ) )