[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/security/pwmanager/pwmanager/masterkey
From: Michael Buesch <mbuesch () freenet ! de>
Date: 2006-06-08 16:05:34
Message-ID: 1149782734.022082.17283.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 549443 by mbuesch:
fix stupid masterkey bug. text() returns the _displayed_ text. That are ******* and not the \
password, in most cases.
M +7 -7 newmasterkeywnd.cpp
M +1 -1 newmasterkeywnd.h
--- trunk/extragear/security/pwmanager/pwmanager/masterkey/newmasterkeywnd.cpp #549442:549443
@@ -85,8 +85,8 @@
bool MkPasswordWnd::okAllowed()
{
bool allowed = false;
- QString s0(pw0->text());
- QString s1(pw1->text());
+ QString s0(pw0->password());
+ QString s1(pw1->password());
if (s0.isEmpty() && s1.isEmpty())
status->setText(i18n("Passwords are empty"));
else if (s0 != s1)
@@ -101,11 +101,11 @@
return allowed;
}
-QString MkPasswordWnd::getPassword()
+const char * MkPasswordWnd::getPassword()
{
- PWM_ASSERT(pw0->text() == pw1->text());
- PWM_ASSERT(!pw0->text().isEmpty());
- return pw0->text();
+ PWM_ASSERT(!QString(pw0->password()).isEmpty());
+ PWM_ASSERT(QString(pw0->password()) == QString(pw1->password()));
+ return pw0->password();
}
void MkPasswordWnd::textChanged(const QString & /*text*/)
@@ -340,7 +340,7 @@
MkSmartKeyWnd *smartKeyWnd;
if (passwordWnd) {
savedKeyType = MasterKey::type_password;
- const char *pw = passwordWnd->getPassword().ascii();
+ const char *pw = passwordWnd->getPassword();
savedKey.duplicate(pw, qstrlen(pw));
goto accept;
}
--- trunk/extragear/security/pwmanager/pwmanager/masterkey/newmasterkeywnd.h #549442:549443
@@ -55,7 +55,7 @@
/** Returns if the Ok button is allowed. */
bool okAllowed();
/** Returns the entered password. */
- QString getPassword();
+ const char * getPassword();
protected slots:
/** The text in one KPasswordEdit changed. */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic