Get more of the new QML interface working for Lumina 2.

* simple context menu is now functional (lock/logout)
* Screensaver is now working again (default setting was wrong)
* Unlock functionality is working again (using the more secure temporary file method)

2 files changed, 8 insertions, 4 deletions

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 b791ffd2..95b70e54 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LLockScreen.cpp
@@ -83,10 +83,14 @@ void LLockScreen::TryUnlock(){
   bool ok = false;
   if( TF->open() ){
     QTextStream in(TF);
-    in << pass;
-    in.flush(); //make sure we push it to the file **right now** since we need to keep the file open
-    ok = (LUtils::runCmd("lumina-checkpass", QStringList() << "-f" << TF->fileName() ) == 0);
+    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;
   if(ok){
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
index 122307b3..7c098887 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -7,7 +7,7 @@
 
 #include "SSBaseWidget.h"
 
-#define DEBUG 1
+#define DEBUG 0
 
 // ========
 //   PUBLIC