author | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-20 21:49:11 (UTC) |
commit | 258feac229c2e8b5016670c1edc442e923c58628 (patch) (unidiff) | |
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 | |||
@@ -95,12 +95,13 @@ KeyRegisterList keyRegisterList; | |||
95 | 95 | ||
96 | static Desktop* qpedesktop = 0; | 96 | static Desktop* qpedesktop = 0; |
97 | static int loggedin = 0; | 97 | static int loggedin = 0; |
98 | static void login( bool at_poweron ) | 98 | static void login( bool at_poweron ) |
99 | { | 99 | { |
100 | if ( !loggedin ) { | 100 | if ( !loggedin ) { |
101 | Global::terminateBuiltin( "calibrate" ); | ||
101 | Password::authenticate( at_poweron ); | 102 | Password::authenticate( at_poweron ); |
102 | loggedin = 1; | 103 | loggedin = 1; |
103 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); | 104 | QCopEnvelope e( "QPE/Desktop", "unlocked()" ); |
104 | } | 105 | } |
105 | } | 106 | } |
106 | 107 | ||
@@ -618,12 +619,13 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
618 | 619 | ||
619 | void Desktop::executeOrModify( const QString& appLnkFile ) | 620 | void Desktop::executeOrModify( const QString& appLnkFile ) |
620 | { | 621 | { |
621 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); | 622 | AppLnk lnk( MimeType::appsFolderName() + "/" + appLnkFile ); |
622 | if ( lnk.isValid() ) { | 623 | if ( lnk.isValid() ) { |
623 | QCString app = lnk.exec().utf8(); | 624 | QCString app = lnk.exec().utf8(); |
625 | Global::terminateBuiltin( "calibrate" ); | ||
624 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { | 626 | if ( QCopChannel::isRegistered( "QPE/Application/" + app ) ) { |
625 | // MRUList::addTask( &lnk ); | 627 | // MRUList::addTask( &lnk ); |
626 | if ( hasVisibleWindow( app ) ) | 628 | if ( hasVisibleWindow( app ) ) |
627 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); | 629 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); |
628 | else | 630 | else |
629 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); | 631 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); |