diff options
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml | 10 | ||||
| -rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp | 5 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml index ad584f76..4ab8e156 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/ContextMenu.qml @@ -12,9 +12,9 @@ import Lumina.Backend.RootDesktopObject 2.0 Menu { id: contextMenu - //closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside MenuItem { text: "Lock Screen" + iconName: "system-lock-screen" onTriggered: { RootObject.lockscreen() } @@ -22,13 +22,7 @@ Menu { MenuItem { text: "Logout" - //iconName: "system-log-out" - /*indicator: Image{ - asynchronous: true - //autoTransform: true - //source: "image://theme/system-logout" - source: "file:///usr/local/share/icons/material-design-light/scalable/actions/system-log-out.svg" - }*/ + iconName: "system-log-out" onTriggered: { RootObject.logout() } diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp index 95b70e54..2cfd0f4a 100644 --- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp @@ -84,15 +84,12 @@ void LLockScreen::TryUnlock(){ if( TF->open() ){ QTextStream in(TF); in << pass.toUtf8()+"\0"; //make sure it is null-terminated - //in.flush(); //make sure we push it to the file **right now** since we need to keep the file open TF->close(); //qDebug() << "Trying to unlock session:" << TF->fileName() << LUtils::readFile(TF->fileName()); //qDebug() << "UserName:" << getlogin(); LUtils::runCommand(ok, "lumina-checkpass",QStringList() << "-f" << TF->fileName() ); - //ok = (LUtils::runCmd("lumina-checkpass", QStringList() << "-f" << TF->fileName() ) == 0); - //TF->close(); } - delete TF; + delete TF; //ensure the temporary file is removed **right now** for security purposes if(ok){ emit ScreenUnlocked(); this->setEnabled(true); |