Merge tag 'epoch-1.7.0' into local/yoda-main

Epoch 1.7.0
This commit is contained in:
Lionel DARNIS 2026-08-27 07:49:24 +02:00
commit 117990202a
4 changed files with 14 additions and 3 deletions

View file

@ -2,7 +2,7 @@ accessibility = Přístupnost
.screen-reader = Čtečka obrazovky
.magnifier = Lupa
.high-contrast = Vysoký kontrast
.invert-colors = Převrátit barvy
.invert-colors = Inverze barev
cancel = Zrušit
caps-lock = Caps Lock je aktivní.
enter-user = Zadat jméno ručně...

View file

@ -1,4 +1,4 @@
cancel = Annuller
cancel = Afbryd
restart = Genstart
caps-lock = Skiftelås er aktiv.
enter-user = Indtast navn manuelt...

View file

@ -363,6 +363,9 @@ pub enum Message {
Common(common::Message),
OutputEvent(OutputEvent, WlOutput),
Auth(Option<String>),
/// Non-fatal error message from PAM (`PAM_ERROR_MSG`), reported by greetd as an auth
/// message of type `Error`. Unlike [`Message::Error`] the conversation stays alive.
AuthError(String),
ConfigUpdateUser,
DialogCancel,
DialogConfirm,
@ -1493,6 +1496,13 @@ impl cosmic::Application for App {
self.authenticating = true;
self.send_request(Request::PostAuthMessageResponse { response });
}
Message::AuthError(error) => {
// The conversation continues, so acknowledge like any other
// non-interactive auth message rather than cancelling the session.
self.common.error_opt = Some(error);
self.authenticating = false;
self.send_request(Request::PostAuthMessageResponse { response: None });
}
Message::Login => {
self.common.prompt_opt = None;
self.common.error_opt = None;

View file

@ -115,7 +115,8 @@ pub fn subscription() -> Subscription<Message> {
.await;
}
greetd_ipc::AuthMessageType::Error => {
_ = sender.send(Message::Error(auth_message)).await;
// PAM_ERROR_MSG: a failed attempt, not a dead session.
_ = sender.send(Message::AuthError(auth_message)).await;
}
},
greetd_ipc::Response::Error {