summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 17:46:51 (UTC)
committer zecke <zecke>2004-07-17 17:46:51 (UTC)
commit8cc200a72b547bb7e313cfa197c72f91dfe0c759 (patch) (unidiff)
treecb2622d03615077dab25dc07e295126f11529a9b
parentc225b5a9da381329610ae593684d687d18a19280 (diff)
downloadopie-8cc200a72b547bb7e313cfa197c72f91dfe0c759.zip
opie-8cc200a72b547bb7e313cfa197c72f91dfe0c759.tar.gz
opie-8cc200a72b547bb7e313cfa197c72f91dfe0c759.tar.bz2
Change the default for needToAuthenticate
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiesecurity/multiauthpassword.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp
index 16c8568..b9c8a39 100644
--- a/libopie2/opiesecurity/multiauthpassword.cpp
+++ b/libopie2/opiesecurity/multiauthpassword.cpp
@@ -1,106 +1,106 @@
1/** 1/**
2 * \file multiauthpassord.cpp 2 * \file multiauthpassord.cpp
3 * \brief Password Dialog dropin. 3 * \brief Password Dialog dropin.
4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) 4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
5 */ 5 */
6/* 6/*
7 =. This file is part of the Opie Project 7 =. This file is part of the Opie Project
8 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> 8 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
9 .>+-= 9 .>+-=
10 _;:, .> :=|. This library is free software; you can 10 _;:, .> :=|. This library is free software; you can
11.> <`_, > . <= redistribute it and/or modify it under 11.> <`_, > . <= redistribute it and/or modify it under
12:`=1 )Y*s>-.-- : the terms of the GNU Library General Public 12:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
13.="- .-=="i, .._ License as published by the Free Software 13.="- .-=="i, .._ License as published by the Free Software
14 - . .-<_> .<> Foundation; either version 2 of the License, 14 - . .-<_> .<> Foundation; either version 2 of the License,
15 ._= =} : or (at your option) any later version. 15 ._= =} : or (at your option) any later version.
16 .%`+i> _;_. 16 .%`+i> _;_.
17 .i_,=:_. -<s. This library is distributed in the hope that 17 .i_,=:_. -<s. This library is distributed in the hope that
18 + . -:. = it will be useful, but WITHOUT ANY WARRANTY; 18 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
19 : .. .:, . . . without even the implied warranty of 19 : .. .:, . . . without even the implied warranty of
20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A 20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU 21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
22..}^=.= = ; Library General Public License for more 22..}^=.= = ; Library General Public License for more
23++= -. .` .: details. 23++= -. .` .: details.
24 : = ...= . :.=- 24 : = ...= . :.=-
25 -. .:....=;==+<; You should have received a copy of the GNU 25 -. .:....=;==+<; You should have received a copy of the GNU
26 -_. . . )=. = Library General Public License along with 26 -_. . . )=. = Library General Public License along with
27 -- :-=` this library; see the file COPYING.LIB. 27 -- :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation, 28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330, 29 Inc., 59 Temple Place - Suite 330,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
31 31
32*/ 32*/
33 33
34 34
35/* OPIE */ 35/* OPIE */
36#include <opie2/multiauthcommon.h> 36#include <opie2/multiauthcommon.h>
37#include <opie2/multiauthmainwindow.h> 37#include <opie2/multiauthmainwindow.h>
38#include <qpe/config.h> 38#include <qpe/config.h>
39#include <qpe/qlibrary.h> 39#include <qpe/qlibrary.h>
40#include <qpe/qcom.h> 40#include <qpe/qcom.h>
41 41
42/* QT */ 42/* QT */
43#include <qapplication.h> 43#include <qapplication.h>
44#include <qvbox.h> 44#include <qvbox.h>
45#include <qpushbutton.h> 45#include <qpushbutton.h>
46#include <qlabel.h> 46#include <qlabel.h>
47#include <qdir.h> 47#include <qdir.h>
48 48
49#include "multiauthpassword.h" 49#include "multiauthpassword.h"
50 50
51namespace Opie { 51namespace Opie {
52namespace Security { 52namespace Security {
53 53
54 54
55/** 55/**
56 * If the users requires authentication... #fixme 56 * If the users requires authentication... #fixme
57 * 57 *
58 * @todo fix up at_poweron attribute 58 * @todo fix up at_poweron attribute
59 */ 59 */
60bool MultiauthPassword::needToAuthenticate(bool at_poweron) 60bool MultiauthPassword::needToAuthenticate(bool at_poweron)
61{ 61{
62 Config cfg("Security"); 62 Config cfg("Security");
63 cfg.setGroup("Misc"); 63 cfg.setGroup("Misc");
64 if ( !at_poweron && cfg.readBoolEntry("onStart", true) ) 64 if ( !at_poweron && cfg.readBoolEntry("onStart", false) )
65 return true; 65 return true;
66 else if ( at_poweron && cfg.readBoolEntry("onResume", true) ) 66 else if ( at_poweron && cfg.readBoolEntry("onResume", false) )
67 return true; 67 return true;
68 else 68 else
69 return false; 69 return false;
70} 70}
71 71
72 72
73/** 73/**
74 * \brief Require user authentication to unlock and continue 74 * \brief Require user authentication to unlock and continue
75 * 75 *
76 * This method will check if you require authentication 76 * This method will check if you require authentication
77 * and then will lock the screen and require a succesfull 77 * and then will lock the screen and require a succesfull
78 * authentication. 78 * authentication.
79 * Authenticate may enter the event loop and only returns 79 * Authenticate may enter the event loop and only returns
80 * if the user sucesfully authenticated to the system. 80 * if the user sucesfully authenticated to the system.
81 * 81 *
82 * @return only if succesfully authenticated 82 * @return only if succesfully authenticated
83 */ 83 */
84void MultiauthPassword::authenticate(bool at_poweron) 84void MultiauthPassword::authenticate(bool at_poweron)
85{ 85{
86 if ( ! needToAuthenticate(at_poweron) ) 86 if ( ! needToAuthenticate(at_poweron) )
87 return; 87 return;
88 88
89 /* Constructs the main window, which displays messages and blocks 89 /* Constructs the main window, which displays messages and blocks
90 * access to the desktop 90 * access to the desktop
91 */ 91 */
92 MultiauthMainWindow win; 92 MultiauthMainWindow win;
93 93
94 // resize the QDialog object so it fills all the screen 94 // resize the QDialog object so it fills all the screen
95 QRect desk = qApp->desktop()->geometry(); 95 QRect desk = qApp->desktop()->geometry();
96 win.setGeometry( 0, 0, desk.width(), desk.height() ); 96 win.setGeometry( 0, 0, desk.width(), desk.height() );
97 97
98 // the authentication has already succeeded (without win interactions) 98 // the authentication has already succeeded (without win interactions)
99 if ( win.isAlreadyDone() ) 99 if ( win.isAlreadyDone() )
100 return; 100 return;
101 101
102 win.exec(); 102 win.exec();
103} 103}
104 104
105} 105}
106} 106}