-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 | |||
@@ -89,24 +89,25 @@ private: | |||
89 | int keyCode; | 89 | int keyCode; |
90 | QCString channel, message; | 90 | QCString channel, message; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | typedef QValueList<QCopKeyRegister> KeyRegisterList; | 93 | typedef QValueList<QCopKeyRegister> KeyRegisterList; |
94 | KeyRegisterList keyRegisterList; | 94 | 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 | ||
107 | bool Desktop::screenLocked() | 108 | bool Desktop::screenLocked() |
108 | { | 109 | { |
109 | return loggedin == 0; | 110 | return loggedin == 0; |
110 | } | 111 | } |
111 | 112 | ||
112 | /* | 113 | /* |
@@ -612,24 +613,25 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
612 | return TRUE; | 613 | return TRUE; |
613 | } | 614 | } |
614 | #endif | 615 | #endif |
615 | return FALSE; | 616 | return FALSE; |
616 | } | 617 | } |
617 | 618 | ||
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()" ); |
630 | } | 632 | } |
631 | else { | 633 | else { |
632 | lnk.execute(); | 634 | lnk.execute(); |
633 | } | 635 | } |
634 | } | 636 | } |
635 | } | 637 | } |