From 511db39244294c42632538ea522454fd44a66ae9 Mon Sep 17 00:00:00 2001
From: Federico Maria Morrone <contact@morrone.dev>
Date: Sun, 15 Sep 2024 14:22:15 +0200
Subject: [PATCH] Fix waynest imports

---
 src/protocol/wayland/callback.rs   | 2 +-
 src/protocol/wayland/compositor.rs | 2 +-
 src/protocol/wayland/display.rs    | 2 +-
 src/protocol/wayland/output.rs     | 2 +-
 src/protocol/wayland/registry.rs   | 2 +-
 src/protocol/wayland/seat.rs       | 2 +-
 src/protocol/wayland/shm.rs        | 2 +-
 src/protocol/wayland/shm_pool.rs   | 2 +-
 src/protocol/wayland/surface.rs    | 4 ++--
 src/protocol/xdg/surface.rs        | 2 +-
 src/protocol/xdg/toplevel.rs       | 2 +-
 src/protocol/xdg/wm_base.rs        | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/protocol/wayland/callback.rs b/src/protocol/wayland/callback.rs
index 050a734..1c52a21 100644
--- a/src/protocol/wayland/callback.rs
+++ b/src/protocol/wayland/callback.rs
@@ -1,6 +1,6 @@
 use waynest::server::{Dispatcher, Result};
 
-pub use waynest::server::protocol::wayland::wl_callback::*;
+pub use waynest::server::protocol::core::wayland::wl_callback::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Callback;
diff --git a/src/protocol/wayland/compositor.rs b/src/protocol/wayland/compositor.rs
index 69a48b4..4e67e80 100644
--- a/src/protocol/wayland/compositor.rs
+++ b/src/protocol/wayland/compositor.rs
@@ -5,7 +5,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_compositor::*;
+pub use waynest::server::protocol::core::wayland::wl_compositor::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Compositor;
diff --git a/src/protocol/wayland/display.rs b/src/protocol/wayland/display.rs
index 0746755..12b2a09 100644
--- a/src/protocol/wayland/display.rs
+++ b/src/protocol/wayland/display.rs
@@ -8,7 +8,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_display::*;
+pub use waynest::server::protocol::core::wayland::wl_display::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Display;
diff --git a/src/protocol/wayland/output.rs b/src/protocol/wayland/output.rs
index 42bc7a0..2c0c442 100644
--- a/src/protocol/wayland/output.rs
+++ b/src/protocol/wayland/output.rs
@@ -1,6 +1,6 @@
 use waynest::server::{Client, Dispatcher, Object, Result};
 
-pub use waynest::server::protocol::wayland::wl_output::*;
+pub use waynest::server::protocol::core::wayland::wl_output::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Output;
diff --git a/src/protocol/wayland/registry.rs b/src/protocol/wayland/registry.rs
index c743038..980099c 100644
--- a/src/protocol/wayland/registry.rs
+++ b/src/protocol/wayland/registry.rs
@@ -13,7 +13,7 @@ use waynest::{
     wire::NewId,
 };
 
-pub use waynest::server::protocol::wayland::wl_registry::*;
+pub use waynest::server::protocol::core::wayland::wl_registry::*;
 
 struct RegistryGlobals;
 
diff --git a/src/protocol/wayland/seat.rs b/src/protocol/wayland/seat.rs
index 417aef7..199b20b 100644
--- a/src/protocol/wayland/seat.rs
+++ b/src/protocol/wayland/seat.rs
@@ -3,7 +3,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_seat::*;
+pub use waynest::server::protocol::core::wayland::wl_seat::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Seat;
diff --git a/src/protocol/wayland/shm.rs b/src/protocol/wayland/shm.rs
index 9f95d51..2d6153a 100644
--- a/src/protocol/wayland/shm.rs
+++ b/src/protocol/wayland/shm.rs
@@ -7,7 +7,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_shm::*;
+pub use waynest::server::protocol::core::wayland::wl_shm::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Shm;
diff --git a/src/protocol/wayland/shm_pool.rs b/src/protocol/wayland/shm_pool.rs
index dd4c4ed..a798b6b 100644
--- a/src/protocol/wayland/shm_pool.rs
+++ b/src/protocol/wayland/shm_pool.rs
@@ -13,7 +13,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_shm_pool::*;
+pub use waynest::server::protocol::core::wayland::wl_shm_pool::*;
 
 #[derive(Debug, Dispatcher)]
 pub struct ShmPool {
diff --git a/src/protocol/wayland/surface.rs b/src/protocol/wayland/surface.rs
index 82e6324..dd832c8 100644
--- a/src/protocol/wayland/surface.rs
+++ b/src/protocol/wayland/surface.rs
@@ -3,7 +3,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::wayland::wl_surface::*;
+pub use waynest::server::protocol::core::wayland::wl_surface::*;
 
 #[derive(Debug, Default)]
 struct State {}
@@ -84,7 +84,7 @@ impl WlSurface for Surface {
         &self,
         _object: &Object,
         _client: &mut Client,
-        _transform: waynest::server::protocol::wayland::wl_output::Transform,
+        _transform: waynest::server::protocol::core::wayland::wl_output::Transform,
     ) -> Result<()> {
         todo!()
     }
diff --git a/src/protocol/xdg/surface.rs b/src/protocol/xdg/surface.rs
index 0c1de03..3eeaacd 100644
--- a/src/protocol/xdg/surface.rs
+++ b/src/protocol/xdg/surface.rs
@@ -5,7 +5,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::xdg_shell::xdg_surface::*;
+pub use waynest::server::protocol::stable::xdg_shell::xdg_surface::*;
 
 #[derive(Debug, Dispatcher)]
 pub struct Surface {
diff --git a/src/protocol/xdg/toplevel.rs b/src/protocol/xdg/toplevel.rs
index 8072924..8f97f97 100644
--- a/src/protocol/xdg/toplevel.rs
+++ b/src/protocol/xdg/toplevel.rs
@@ -3,7 +3,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::xdg_shell::xdg_toplevel::*;
+pub use waynest::server::protocol::stable::xdg_shell::xdg_toplevel::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct Toplevel;
diff --git a/src/protocol/xdg/wm_base.rs b/src/protocol/xdg/wm_base.rs
index d9f9d90..712255a 100644
--- a/src/protocol/xdg/wm_base.rs
+++ b/src/protocol/xdg/wm_base.rs
@@ -5,7 +5,7 @@ use waynest::{
     wire::ObjectId,
 };
 
-pub use waynest::server::protocol::xdg_shell::xdg_wm_base::*;
+pub use waynest::server::protocol::stable::xdg_shell::xdg_wm_base::*;
 
 #[derive(Debug, Dispatcher, Default)]
 pub struct WmBase;