Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13975 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval 2005-08-18 15:30:02 +00:00
parent cd661dfcf8
commit 6ebd8e95cd
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/screen_blanker/PasswordWindow.cpp
View File

@ -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);

1
src/bin/screen_blanker/PasswordWindow.h
View File

@ -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:

18
src/bin/screen_blanker/ScreenSaverApp.cpp
View File

@ -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