fix build

cosmic-applet-workspaces/Cargo.toml

@@ -9,9 +9,6 @@ libcosmic.workspace = true
 cosmic-applet = { path = "../applet" }
 cctk.workspace = true
 cosmic-protocols.workspace = true
-wayland-backend = {version = "0.1.0", features = ["client_system"]}
-wayland-client = {version = "0.30.0"}
-calloop = "0.10.1"
 nix = "0.26.1"
 log = "0.4"
 pretty_env_logger = "0.5"

cosmic-applet-workspaces/src/components/app.rs

@@ -1,4 +1,4 @@
-use calloop::channel::SyncSender;
+use cctk::sctk::reexports::{calloop::channel::SyncSender, client::backend::ObjectId};
 use cosmic::iced::alignment::{Horizontal, Vertical};
 use cosmic::iced::mouse::{self, ScrollDelta};
 use cosmic::iced::wayland::actions::window::SctkWindowSettings;
@@ -16,7 +16,6 @@ use cosmic_applet::cosmic_panel_config::PanelAnchor;
 use cosmic_applet::CosmicAppletHelper;
 use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
 use std::cmp::Ordering;
-use wayland_backend::client::ObjectId;
 
 use crate::config;
 use crate::wayland::{WorkspaceEvent, WorkspaceList};

cosmic-applet-workspaces/src/wayland.rs

@@ -3,7 +3,10 @@ use cctk::{
     sctk::{
         self,
         output::{OutputHandler, OutputState},
-        reexports::client::WaylandSource,
+        reexports::{
+            calloop,
+            client::{self as wayland_client},
+        },
         registry::{ProvidesRegistryState, RegistryState},
     },
     workspace::{WorkspaceHandler, WorkspaceState},
@@ -11,11 +14,11 @@ use cctk::{
 use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
 use futures::{channel::mpsc, executor::block_on, SinkExt};
 use std::{env, os::unix::net::UnixStream, path::PathBuf, time::Duration};
-use wayland_backend::client::ObjectId;
+use wayland_client::backend::ObjectId;
 use wayland_client::{
     globals::registry_queue_init,
     protocol::wl_output::{self, WlOutput},
-    ConnectError, Proxy,
+    ConnectError, Proxy, WaylandSource,
 };
 use wayland_client::{Connection, QueueHandle, WEnum};
 

cosmic-applet-workspaces/src/wayland_subscription.rs

@@ -1,5 +1,5 @@
 use crate::wayland::{self, WorkspaceEvent, WorkspaceList};
-use calloop::channel::SyncSender;
+use cctk::sctk::reexports::calloop::channel::SyncSender;
 use cosmic::iced::{
     self,
     futures::{channel::mpsc, SinkExt, StreamExt},