Revert SCTK changes

panics on startup under weston with no obvious fix.

This reverts commit 3938d1a.
This reverts commit aab3835.
This reverts commit 0c97ace.

refs: #5044

window/Cargo.toml

@@ -15,7 +15,7 @@ k9 = "0.11.0"
 gl_generator = "0.14"
 
 [features]
-wayland = ["wayland-client", "smithay-client-toolkit", "wayland-egl", "wayland-protocols", "wayland-csd-frame"]
+wayland = ["wayland-client", "smithay-client-toolkit", "wayland-egl", "wayland-protocols"]
 
 [dependencies]
 async-channel = "1.6"
@@ -81,11 +81,10 @@ xcb-imdkit = { version="0.3", git="https://github.com/wez/xcb-imdkit-rs.git", re
 zbus = "3.14"
 zvariant = "3.15"
 
-smithay-client-toolkit = {version = "0.18.1", default-features=false, optional=true}
-wayland-protocols = {version="0.31", optional=true}
-wayland-client = {version="0.31", optional=true}
-wayland-egl = {version="0.32", optional=true}
-wayland-csd-frame = { version = "0.3.0", optional = true}
+smithay-client-toolkit = {version = "0.17.0", default-features=false, optional=true}
+wayland-protocols = {version="0.30", optional=true}
+wayland-client = {version="0.30", optional=true}
+wayland-egl = {version="0.30", optional=true}
 
 [target.'cfg(target_os="macos")'.dependencies]
 cocoa = "0.25"

window/src/os/wayland/connection.rs

@@ -58,11 +58,7 @@ impl WaylandConnection {
         let mut events = Events::with_capacity(8);
 
         let wl_fd = {
-            let read_guard = self
-                .event_queue
-                .borrow()
-                .prepare_read()
-                .ok_or_else(|| anyhow::anyhow!("Failed to preapre event queue"))?;
+            let read_guard = self.event_queue.borrow().prepare_read()?;
             read_guard.connection_fd().as_raw_fd()
         };
 
@@ -104,7 +100,7 @@ impl WaylandConnection {
                     continue;
                 }
 
-                if let Some(guard) = event_q.prepare_read() {
+                if let Ok(guard) = event_q.prepare_read() {
                     if let Err(err) = guard.read() {
                         log::trace!("Event Q error: {:?}", err);
                         if let WaylandError::Protocol(perr) = err {