3 files changed, 10 insertions, 7 deletions
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 049798dc..f9bd2589 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -20,7 +20,7 @@ use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::reexports::wayland_server::Resource;
 use smithay::utils::{Logical, Rectangle, Size};
 use smithay::wayland::compositor::{send_surface_state, with_states};
-use smithay::wayland::dmabuf::{DmabufGlobal, DmabufHandler, DmabufState, ImportError};
+use smithay::wayland::dmabuf::{DmabufGlobal, DmabufHandler, DmabufState, ImportNotifier};
 use smithay::wayland::input_method::{InputMethodHandler, PopupSurface};
 use smithay::wayland::selection::data_device::{
     set_data_device_focus, ClientDndGrabHandler, DataDeviceHandler, DataDeviceState,
@@ -189,15 +189,18 @@ impl DmabufHandler for State {
         &mut self,
         _global: &DmabufGlobal,
         dmabuf: Dmabuf,
-    ) -> Result<(), ImportError> {
+        notifier: ImportNotifier,
+    ) {
         let renderer = self.backend.renderer().expect(
             "the dmabuf global must be created and destroyed together with the output device",
         );
         match renderer.import_dmabuf(&dmabuf, None) {
-            Ok(_texture) => Ok(()),
+            Ok(_texture) => {
+                let _ = notifier.successful::<State>();
+            }
             Err(err) => {
                 debug!("error importing dmabuf: {err:?}");
-                Err(ImportError::Failed)
+                notifier.failed();
             }
         }
     }
diff --git a/src/input.rs b/src/input.rs
index b7ceffd1..96b21c7f 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -192,7 +192,7 @@ impl State {
                             .seat
                             .get_keyboard()
                             .unwrap()
-                            .with_kkb_state(self, |mut state| match action {
+                            .with_xkb_state(self, |mut state| match action {
                                 LayoutAction::Next => state.cycle_next_layout(),
                                 LayoutAction::Prev => state.cycle_prev_layout(),
                             });
diff --git a/src/niri.rs b/src/niri.rs
index b7b687ef..4431167b 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -407,7 +407,7 @@ impl State {
         if current_focus != focus {
             if self.niri.config.borrow().input.keyboard.track_layout == TrackLayout::Window {
                 let current_layout =
-                    keyboard.with_kkb_state(self, |context| context.active_layout());
+                    keyboard.with_xkb_state(self, |context| context.active_layout());
 
                 let mut new_layout = current_layout;
                 // Store the currently active layout for the surface.
@@ -432,7 +432,7 @@ impl State {
                 }
                 if new_layout != current_layout && focus.is_some() {
                     keyboard.set_focus(self, None, SERIAL_COUNTER.next_serial());
-                    keyboard.with_kkb_state(self, |mut context| {
+                    keyboard.with_xkb_state(self, |mut context| {
                         context.set_layout(new_layout);
                     });
                 }