-rw-r--r-- | core/launcher/desktop.cpp | 2 |
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 | |||
@@ -89,25 +89,24 @@ 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" ); | ||
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()" ); |
105 | } | 104 | } |
106 | } | 105 | } |
107 | 106 | ||
108 | bool Desktop::screenLocked() | 107 | bool Desktop::screenLocked() |
109 | { | 108 | { |
110 | return loggedin == 0; | 109 | return loggedin == 0; |
111 | } | 110 | } |
112 | 111 | ||
113 | /* | 112 | /* |
@@ -613,25 +612,24 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
613 | return TRUE; | 612 | return TRUE; |
614 | } | 613 | } |
615 | #endif | 614 | #endif |
616 | return FALSE; | 615 | return FALSE; |
617 | } | 616 | } |
618 | 617 | ||
619 | 618 | ||
620 | void Desktop::executeOrModify( const QString& appLnkFile ) | 619 | void Desktop::executeOrModify( const QString& appLnkFile ) |
621 | { | 620 | { |
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 ) ) |
629 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); | 627 | QCopChannel::send( "QPE/Application/" + app, "nextView()" ); |
630 | else | 628 | else |
631 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); | 629 | QCopChannel::send( "QPE/Application/" + app, "raise()" ); |
632 | } | 630 | } |
633 | else { | 631 | else { |
634 | lnk.execute(); | 632 | lnk.execute(); |
635 | } | 633 | } |
636 | } | 634 | } |
637 | } | 635 | } |