fix build

Author: wash2

Cargo.lock

@@ -20,7 +20,7 @@ resolver="2"
 [workspace.dependencies]
 cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" }
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "e39748e" }
-cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] }
+cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "c39e737", default-features = false, features = ["libcosmic", "once_cell"] }
 libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] }
 
 [profile.release]

Cargo.toml

@@ -16,7 +16,6 @@ futures-util = "0.3"
 once_cell = "1.9"
 xdg = "2.4"
 pretty_env_logger = "0.5"
-calloop = "0.10"
 nix = "0.26"
 shlex = "1.1.0"
 anyhow = "1.0"

cosmic-app-list/Cargo.toml

@@ -5,7 +5,7 @@ use crate::fl;
 use crate::toplevel_subscription::toplevel_subscription;
 use crate::toplevel_subscription::ToplevelRequest;
 use crate::toplevel_subscription::ToplevelUpdate;
-use calloop::channel::Sender;
+use cctk::sctk::reexports::calloop::channel::Sender;
 use cctk::toplevel_info::ToplevelInfo;
 use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
 use cctk::wayland_client::protocol::wl_seat::WlSeat;

cosmic-app-list/src/app.rs

@@ -2,7 +2,10 @@ use crate::toplevel_subscription::{ToplevelRequest, ToplevelUpdate};
 use cctk::{
     sctk::{
         self,
-        reexports::client::{protocol::wl_seat::WlSeat, WaylandSource},
+        reexports::{
+            calloop,
+            client::{protocol::wl_seat::WlSeat, WaylandSource},
+        },
         seat::{SeatHandler, SeatState},
     },
     toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
@@ -131,13 +134,9 @@ pub(crate) fn toplevel_handler(
     let qh = event_queue.handle();
     let wayland_source = WaylandSource::new(event_queue).unwrap();
     let handle = event_loop.handle();
-
-    if handle
-        .insert_source(wayland_source, |_, q, state| q.dispatch_pending(state))
-        .is_err()
-    {
-        return;
-    };
+    wayland_source
+        .insert(handle.clone())
+        .expect("Failed to insert wayland source.");
 
     if handle
         .insert_source(rx, |event, _, state| match event {

cosmic-app-list/src/toplevel_handler.rs

@@ -2,7 +2,7 @@
 //!
 //! This code was generated by `zbus-xmlgen` `2.0.1` from DBus introspection data.
 //! Source: `Interface '/org/freedesktop/UPower/KbdBacklight' from service 'org.freedesktop.UPower' on system bus`.
-use cctk::sctk::reexports::client::protocol::wl_seat::WlSeat;
+use cctk::sctk::reexports::{calloop, client::protocol::wl_seat::WlSeat};
 use cctk::toplevel_info::ToplevelInfo;
 use cosmic::iced;
 use cosmic::iced::subscription;

cosmic-app-list/src/toplevel_subscription.rs

@@ -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/Cargo.toml

@@ -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/components/app.rs

@@ -3,19 +3,22 @@ use cctk::{
     sctk::{
         self,
         output::{OutputHandler, OutputState},
-        reexports::client::WaylandSource,
+        reexports::{
+            calloop,
+            client::{self as wayland_client},
+        },
         registry::{ProvidesRegistryState, RegistryState},
     },
     workspace::{WorkspaceHandler, WorkspaceState},
 };
 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.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},