diff options
Diffstat (limited to 'src/river_protocols')
| -rw-r--r-- | src/river_protocols/control.rs | 8 | ||||
| -rw-r--r-- | src/river_protocols/status.rs | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/river_protocols/control.rs b/src/river_protocols/control.rs index 0e7d7e4..525a9db 100644 --- a/src/river_protocols/control.rs +++ b/src/river_protocols/control.rs @@ -60,7 +60,7 @@ impl RiverControlState { for arg in args { control.add_argument(arg.into()); } - control.run_command(seat, qh, RiverCommandCallbackData {})?; + control.run_command(seat, qh, RiverCommandCallbackData {}); Ok(()) } } @@ -82,8 +82,10 @@ pub struct RiverCommandCallbackData { macro_rules! delegate_river_control { ($ty: ty) => { ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [ - $crate::river_protocols::control::protocol::zriver_control_v1::ZriverControlV1: ::smithay_client_toolkit::globals::GlobalData, - $crate::river_protocols::control::protocol::zriver_command_callback_v1::ZriverCommandCallbackV1: $crate::river_protocols::control::RiverCommandCallbackData, + $crate::river_protocols::control::protocol::zriver_control_v1::ZriverControlV1: ::smithay_client_toolkit::globals::GlobalData + ] => $crate::river_protocols::control::RiverControlState); + ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [ + $crate::river_protocols::control::protocol::zriver_command_callback_v1::ZriverCommandCallbackV1: $crate::river_protocols::control::RiverCommandCallbackData ] => $crate::river_protocols::control::RiverControlState); }; } diff --git a/src/river_protocols/status.rs b/src/river_protocols/status.rs index f19ac5f..079572a 100644 --- a/src/river_protocols/status.rs +++ b/src/river_protocols/status.rs @@ -66,7 +66,7 @@ impl RiverStatusState { + 'static, { let manager = self.status_manager()?; - let output_status = manager.get_river_output_status(output, qh, RiverStatusData {})?; + let output_status = manager.get_river_output_status(output, qh, RiverStatusData {}); let output_status = RiverOutputStatus(Arc::new(OutputStatusInner { status: output_status, @@ -124,8 +124,10 @@ pub struct RiverStatusData { macro_rules! delegate_river_status { ($ty: ty) => { ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [ - $crate::river_protocols::status::protocol::zriver_status_manager_v1::ZriverStatusManagerV1: ::smithay_client_toolkit::globals::GlobalData, - $crate::river_protocols::status::protocol::zriver_output_status_v1::ZriverOutputStatusV1: $crate::river_protocols::status::RiverStatusData, + $crate::river_protocols::status::protocol::zriver_status_manager_v1::ZriverStatusManagerV1: ::smithay_client_toolkit::globals::GlobalData + ] => $crate::river_protocols::status::RiverStatusState); + ::smithay_client_toolkit::reexports::client::delegate_dispatch!($ty: [ + $crate::river_protocols::status::protocol::zriver_output_status_v1::ZriverOutputStatusV1: $crate::river_protocols::status::RiverStatusData ] => $crate::river_protocols::status::RiverStatusState); }; } |