Merge branch 'serial' into 'master'

imservice: Increment serials on receiving done, not sending commit

See merge request Librem5/squeekboard!426
This commit is contained in:
Dorota Czaplejewicz
2021-01-24 05:14:57 +00:00
2 changed files with 4 additions and 3 deletions

View File

@ -149,6 +149,8 @@ pub mod c {
..IMProtocolState::default()
};
imservice.serial += Wrapping(1u32);
if active_changed {
(imservice.active_callback)(imservice.current.active);
if imservice.current.active {
@ -404,7 +406,6 @@ impl IMService {
unsafe {
c::eek_input_method_commit(self.im, self.serial.0)
}
self.serial += Wrapping(1u32);
Ok(())
},
false => Err(SubmitError::NotActive),