Update dependencies

Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 calloop = "0.10.5"
-cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os/cosmic-protocols" }
+cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os/cosmic-protocols", rev = "e491d91" }
 futures-channel = "0.3.25"
 libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] }
 tokio = "1.23.0"

src/main.rs

@@ -6,7 +6,7 @@ use cctk::{
         toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
         workspace::v1::client::{zcosmic_workspace_handle_v1, zcosmic_workspace_manager_v1},
     },
-    sctk::shell::layer::{KeyboardInteractivity, Layer},
+    sctk::shell::wlr_layer::{KeyboardInteractivity, Layer},
     toplevel_info::ToplevelInfo,
     wayland_client::{
         protocol::{wl_output, wl_seat},

src/wayland/mod.rs

@@ -15,11 +15,10 @@ use cctk::{
     screencopy::ScreencopyState,
     sctk::{
         self,
-        event_loop::WaylandSource,
         output::{OutputHandler, OutputState},
         registry::{ProvidesRegistryState, RegistryState},
         seat::{SeatHandler, SeatState},
-        shm::{ShmHandler, ShmState},
+        shm::{Shm, ShmHandler},
     },
     toplevel_info::{ToplevelInfo, ToplevelInfoState},
     toplevel_management::ToplevelManagerState,
@@ -27,7 +26,7 @@ use cctk::{
         backend::ObjectId,
         globals::registry_queue_init,
         protocol::{wl_output, wl_seat},
-        Connection, Proxy, QueueHandle,
+        Connection, Proxy, QueueHandle, WaylandSource,
     },
     workspace::WorkspaceState,
 };
@@ -96,7 +95,7 @@ pub struct AppData {
     workspace_state: WorkspaceState,
     screencopy_state: ScreencopyState,
     seat_state: SeatState,
-    shm_state: ShmState,
+    shm_state: Shm,
     toplevel_manager_state: ToplevelManagerState,
     sender: mpsc::Sender<Event>,
     output_names: HashMap<ObjectId, Option<String>>,
@@ -219,7 +218,7 @@ impl SeatHandler for AppData {
 }
 
 impl ShmHandler for AppData {
-    fn shm_state(&mut self) -> &mut ShmState {
+    fn shm_state(&mut self) -> &mut Shm {
         &mut self.shm_state
     }
 }
@@ -276,7 +275,7 @@ fn start() -> mpsc::Receiver<Event> {
         screencopy_state: ScreencopyState::new(&globals, &qh),
         registry_state,
         seat_state: SeatState::new(&globals, &qh),
-        shm_state: ShmState::bind(&globals, &qh).unwrap(),
+        shm_state: Shm::bind(&globals, &qh).unwrap(),
         sender,
         output_names: HashMap::new(),
         seats: Vec::new(),