diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-14 11:54:25 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-03-14 11:54:25 -0500 |
| commit | 92321812ee797ee70051a342b37cd7571ab00b61 (patch) | |
| tree | 4d2cdf64634a66eda778639cc560e75aaf6d4f90 | |
| parent | 984c57e3ca467e5f02fa8ab4254e323b56f287e2 (diff) | |
| download | tdebase-92321812ee797ee70051a342b37cd7571ab00b61.tar.gz tdebase-92321812ee797ee70051a342b37cd7571ab00b61.zip | |
Fix broken image selector in KControl Security & Privacy, Password & User Account.
| -rw-r--r-- | kdepasswd/kcm/main.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index 97900e06d..5192c9d1d 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -169,13 +169,13 @@ void KCMUserAccount::load() _mw->btnChangeFace->setPixmap( _facePixmap ); } - if ( _facePerm >= userFirst ) + if ( _facePerm == userFirst ) { // If the user's choice takes preference _facePixmap = TQPixmap( KCFGUserAccount::faceFile() ); // The user has no face, should we check for the admin's setting? - if ( _facePixmap.isNull() && _facePerm == userFirst ) + if ( _facePixmap.isNull() ) _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); if ( _facePixmap.isNull() ) @@ -183,7 +183,7 @@ void KCMUserAccount::load() _mw->btnChangeFace->setPixmap( _facePixmap ); } - else if ( _facePerm <= adminOnly ) + else if ( _facePerm == adminOnly ) { // Admin only _facePixmap = TQPixmap( _userPicsDir + _ku->loginName() + ".face.icon" ); @@ -249,7 +249,7 @@ void KCMUserAccount::save() void KCMUserAccount::changeFace(const TQPixmap &pix) { - if ( _facePerm < userFirst ) + if ( _facePerm != userFirst ) return; // If the user isn't allowed to change their face, don't! if ( pix.isNull() ) { @@ -264,7 +264,7 @@ void KCMUserAccount::changeFace(const TQPixmap &pix) void KCMUserAccount::slotFaceButtonClicked() { - if ( _facePerm < userFirst ) + if ( _facePerm != userFirst ) { KMessageBox::sorry( this, i18n("Your administrator has disallowed changing your image.") ); return; @@ -295,10 +295,9 @@ bool KCMUserAccount::eventFilter(TQObject *, TQEvent *e) if (e->type() == TQEvent::Drop) { - if ( _facePerm < userFirst ) + if ( _facePerm != userFirst ) { - KMessageBox::sorry( this, i18n("Your administrator " - "has disallowed changing your image.") ); + KMessageBox::sorry( this, i18n("Your administrator has disallowed changing your image.") ); return true; } |