From 6ebd8e95cd511e62a72ff79abd911da74e0fa9eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 18 Aug 2005 15:30:02 +0000
Subject: [PATCH] more fixes

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13975 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/bin/screen_blanker/PasswordWindow.cpp |  6 ++++--
 src/bin/screen_blanker/PasswordWindow.h   |  1 +
 src/bin/screen_blanker/ScreenSaverApp.cpp | 18 +++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/bin/screen_blanker/PasswordWindow.cpp b/src/bin/screen_blanker/PasswordWindow.cpp
index e55145f75d..0d010eebab 100644
--- a/src/bin/screen_blanker/PasswordWindow.cpp
+++ b/src/bin/screen_blanker/PasswordWindow.cpp
@@ -5,6 +5,7 @@
 
 #include <Application.h>
 #include <Screen.h>
+#include <StringView.h>
 #include "PasswordWindow.h"
 
 
@@ -22,10 +23,11 @@ PasswordWindow::Setup()
 	bounds.InsetBy(5,5);
 	
 	fCustomBox = new BBox(bounds, "custBeBox", B_FOLLOW_NONE);
-	fCustomBox->SetLabel("Unlock screen saver");
+	BStringView *label = new BStringView(BRect(0,0,60,15), "labelView", "Unlock screen saver");
+	fCustomBox->SetLabel(label);
 	fBgd->AddChild(fCustomBox);
 
-	fPassword = new BTextControl(BRect(10,28,255,47),"pwdCntrl","Enter password:", NULL, B_FOLLOW_NONE);
+	fPassword = new BTextControl(BRect(10,28,260,47),"pwdCntrl","Enter password:", NULL, B_FOLLOW_NONE);
 	fPassword->TextView()->HideTyping(true);
 	fPassword->SetDivider(100);
 	fCustomBox->AddChild(fPassword);
diff --git a/src/bin/screen_blanker/PasswordWindow.h b/src/bin/screen_blanker/PasswordWindow.h
index 1245a56c5d..a92d67ca51 100644
--- a/src/bin/screen_blanker/PasswordWindow.h
+++ b/src/bin/screen_blanker/PasswordWindow.h
@@ -20,6 +20,7 @@ class PasswordWindow : public BWindow
 				B_ALL_WORKSPACES), fDie(false) { Setup(); }
 		void Setup(void);
 		const char *GetPassword(void) {return fPassword->Text();}
+		void SetPassword(const char* text) { Lock(); fPassword->SetText(text); Unlock(); }
 
 		bool fDie;
 	private:
diff --git a/src/bin/screen_blanker/ScreenSaverApp.cpp b/src/bin/screen_blanker/ScreenSaverApp.cpp
index f280021839..810e8267ef 100755
--- a/src/bin/screen_blanker/ScreenSaverApp.cpp
+++ b/src/bin/screen_blanker/ScreenSaverApp.cpp
@@ -86,17 +86,13 @@ ScreenSaverApp::MessageReceived(BMessage *message)
 		{
 			char salt[3] = "";
 			strncpy(salt, fPref.Password(), 2);
-			if (strcmp(crypt(fPww->GetPassword(), salt),fPref.Password())) {
+			if (strcmp(crypt(fPww->GetPassword(), salt),fPref.Password()) != 0) {
 				beep();
-				fPww->Hide();
-				fWin->SetFullScreen(true);
-				if (fThreadID)
-					resume_thread(fThreadID);
-				}
-				else  {
-					PRINT(("Quitting!\n"));
-					Shutdown();
-				}
+				fPww->SetPassword("");
+			} else  {
+				PRINT(("Quitting!\n"));
+				Shutdown();
+			}
 			break;
 		}
 		default:
@@ -109,7 +105,7 @@ ScreenSaverApp::MessageReceived(BMessage *message)
 bool 
 ScreenSaverApp::QuitRequested()
 {
-	if (system_time()-fBlankTime>fPref.PasswordTime()) {
+	if (system_time()-fBlankTime > fPref.PasswordTime()) {
 		ShowPW();
 		return false;
 	} else