entailz/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

Merge pull request #167 from mahkoh/jorth/invalid-activation-token

Browse source 
wayland: ignore invalid activation tokens
This commit is contained in:
mahkoh 2024-04-17 16:52:52 +02:00 • committed by GitHub
commit db81300d02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ifs/xdg_activation_v1.rs
View file

@ -5,7 +5,7 @@ use {
ifs::xdg_activation_token_v1::XdgActivationTokenV1,
leaks::Tracker,
object::{Object, Version},
utils::{activation_token::ActivationToken, opaque::OpaqueError},
utils::{activation_token::ActivationToken, errorfmt::ErrorFmt, opaque::OpaqueError},
wire::{xdg_activation_v1::*, XdgActivationV1Id},
},
std::rc::Rc,
@ -84,7 +84,13 @@ impl XdgActivationV1RequestHandler for XdgActivationV1 {
}
fn activate(&self, req: Activate, _slf: &Rc<Self>) -> Result<(), Self::Error> {
let token: ActivationToken = req.token.parse()?;
let token: ActivationToken = match req.token.parse() {
Ok(t) => t,
Err(e) => {
log::warn!("Could not parse client activation token: {}", ErrorFmt(e));
return Ok(());
}
};
let surface = self.client.lookup(req.surface)?;
if self.client.state.activation_tokens.remove(&token).is_none() {
log::warn!(

2
toml-config/src/lib.rs
View file

@ -590,7 +590,7 @@ impl State {
}
self.persistent
.seat
.bind_masked(shortcut.mask, shortcut.keysym, move || f());
.bind_masked(shortcut.mask, shortcut.keysym, f);
binds.insert(shortcut.keysym);
}
}