raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=55c8ac462531912cec49c5216aa1fd9ea1b1435f
commit 55c8ac462531912cec49c5216aa1fd9ea1b1435f Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Mar 20 19:31:12 2018 +0900 e desklock pam error - go back to previous text since we had translations of this, go back to the prior text so we keep these. also dont show if using a personal password. related to fixing T6779 --- src/bin/e_desklock.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index 0e6cc3d71..1c428748a 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -248,13 +248,13 @@ e_desklock_show(Eina_Bool suspend) E_Zone *zone; #if !defined(HAVE_PAM) && !defined(__FreeBSD__) && !defined(__OpenBSD__) - e_util_dialog_show(_("Cannot use password authentication"), - _("Enlightenment was built without PAM support.<br>" - "This means Enlightenment cannot authenticate<br>" - "your password. This means locking makes no<br>" - "sense because we have no other way to authenticate<br>" - "you as a user.")); - return EINA_FALSE; + if (!e_desklock_is_personal()) + { + e_util_dialog_show(_("Error - no PAM support"), + _("No PAM support was built into Enlightenment, so<ps/>" + "desk locking is disabled.")); + return EINA_FALSE; + } #endif if (_e_desklock_state) return EINA_TRUE; --
