Merge tag 'epoch-1.7.0' into local/yoda-main
Epoch 1.7.0
This commit is contained in:
commit
117990202a
4 changed files with 14 additions and 3 deletions
|
|
@ -2,7 +2,7 @@ accessibility = Přístupnost
|
||||||
.screen-reader = Čtečka obrazovky
|
.screen-reader = Čtečka obrazovky
|
||||||
.magnifier = Lupa
|
.magnifier = Lupa
|
||||||
.high-contrast = Vysoký kontrast
|
.high-contrast = Vysoký kontrast
|
||||||
.invert-colors = Převrátit barvy
|
.invert-colors = Inverze barev
|
||||||
cancel = Zrušit
|
cancel = Zrušit
|
||||||
caps-lock = Caps Lock je aktivní.
|
caps-lock = Caps Lock je aktivní.
|
||||||
enter-user = Zadat jméno ručně...
|
enter-user = Zadat jméno ručně...
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cancel = Annuller
|
cancel = Afbryd
|
||||||
restart = Genstart
|
restart = Genstart
|
||||||
caps-lock = Skiftelås er aktiv.
|
caps-lock = Skiftelås er aktiv.
|
||||||
enter-user = Indtast navn manuelt...
|
enter-user = Indtast navn manuelt...
|
||||||
|
|
|
||||||
|
|
@ -363,6 +363,9 @@ pub enum Message {
|
||||||
Common(common::Message),
|
Common(common::Message),
|
||||||
OutputEvent(OutputEvent, WlOutput),
|
OutputEvent(OutputEvent, WlOutput),
|
||||||
Auth(Option<String>),
|
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,
|
ConfigUpdateUser,
|
||||||
DialogCancel,
|
DialogCancel,
|
||||||
DialogConfirm,
|
DialogConfirm,
|
||||||
|
|
@ -1493,6 +1496,13 @@ impl cosmic::Application for App {
|
||||||
self.authenticating = true;
|
self.authenticating = true;
|
||||||
self.send_request(Request::PostAuthMessageResponse { response });
|
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 => {
|
Message::Login => {
|
||||||
self.common.prompt_opt = None;
|
self.common.prompt_opt = None;
|
||||||
self.common.error_opt = None;
|
self.common.error_opt = None;
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,8 @@ pub fn subscription() -> Subscription<Message> {
|
||||||
.await;
|
.await;
|
||||||
}
|
}
|
||||||
greetd_ipc::AuthMessageType::Error => {
|
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 {
|
greetd_ipc::Response::Error {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue