diff --git a/Cargo.lock b/Cargo.lock index 69a7bb40..466aa980 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,7 +445,6 @@ dependencies = [ "once_cell", "pretty_env_logger", "rust-embed", - "tokio", "wayland-backend", "wayland-client 0.30.0-beta.8", ] diff --git a/applets/cosmic-applet-workspaces/Cargo.toml b/applets/cosmic-applet-workspaces/Cargo.toml index d4d00bb7..29715148 100644 --- a/applets/cosmic-applet-workspaces/Cargo.toml +++ b/applets/cosmic-applet-workspaces/Cargo.toml @@ -17,7 +17,6 @@ anyhow = "1.0.50" i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed-fl = "0.6.4" rust-embed = "6.3.0" -tokio = { version = "1.16.1", features = ["sync"] } wayland-backend = { version = "0.1.0-beta.8" } wayland-client = { version = "0.30.0-beta.8" } calloop = "*" diff --git a/applets/cosmic-applet-workspaces/build.rs b/applets/cosmic-applet-workspaces/build.rs index 410ea0f7..3d9eff82 100644 --- a/applets/cosmic-applet-workspaces/build.rs +++ b/applets/cosmic-applet-workspaces/build.rs @@ -1,4 +1,4 @@ -use std::{env, path::PathBuf, process::Command}; +use std::{process::Command}; fn main() { if let Some(output) = Command::new("git") diff --git a/applets/cosmic-applet-workspaces/src/main.rs b/applets/cosmic-applet-workspaces/src/main.rs index 0a08d3a0..7a415e52 100644 --- a/applets/cosmic-applet-workspaces/src/main.rs +++ b/applets/cosmic-applet-workspaces/src/main.rs @@ -9,10 +9,7 @@ use gtk4::{ CssProvider, StyleContext, }; use once_cell::sync::OnceCell; -use std::sync::{Arc, Mutex}; -use tokio::sync::mpsc; -use utils::{Activate, WorkspaceEvent}; -use wayland::State; +use utils::{WorkspaceEvent}; use window::CosmicWorkspacesWindow; mod localize; diff --git a/applets/cosmic-applet-workspaces/src/utils.rs b/applets/cosmic-applet-workspaces/src/utils.rs index 1e99418e..1310cd9a 100644 --- a/applets/cosmic-applet-workspaces/src/utils.rs +++ b/applets/cosmic-applet-workspaces/src/utils.rs @@ -5,7 +5,6 @@ use std::path::PathBuf; use gtk4::glib; use std::future::Future; -pub type Activate = String; #[derive(Debug, Clone)] pub enum WorkspaceEvent { diff --git a/applets/cosmic-applet-workspaces/src/window/mod.rs b/applets/cosmic-applet-workspaces/src/window/mod.rs index 7e5e08b8..de1a8dc4 100644 --- a/applets/cosmic-applet-workspaces/src/window/mod.rs +++ b/applets/cosmic-applet-workspaces/src/window/mod.rs @@ -1,8 +1,7 @@ // SPDX-License-Identifier: MPL-2.0-only -use crate::{fl, utils::Activate, wayland::State, workspace_list::WorkspaceList}; +use crate::{fl, wayland::State, workspace_list::WorkspaceList}; use cascade::cascade; -use cosmic_panel_config::CosmicPanelConfig; use gtk4::{ gio, glib::{self, Object}, diff --git a/applets/cosmic-applet-workspaces/src/workspace_button/imp.rs b/applets/cosmic-applet-workspaces/src/workspace_button/imp.rs index 483cd249..62eaf224 100644 --- a/applets/cosmic-applet-workspaces/src/workspace_button/imp.rs +++ b/applets/cosmic-applet-workspaces/src/workspace_button/imp.rs @@ -1,8 +1,5 @@ -use crate::Activate; use gtk4::{glib, subclass::prelude::*, ToggleButton}; -use once_cell::sync::OnceCell; use std::{cell::RefCell, rc::Rc}; -use tokio::sync::mpsc; // Object holding the state #[derive(Default)] diff --git a/applets/cosmic-applet-workspaces/src/workspace_button/mod.rs b/applets/cosmic-applet-workspaces/src/workspace_button/mod.rs index ff857065..2a6385a4 100644 --- a/applets/cosmic-applet-workspaces/src/workspace_button/mod.rs +++ b/applets/cosmic-applet-workspaces/src/workspace_button/mod.rs @@ -1,6 +1,6 @@ mod imp; -use crate::{utils::WorkspaceEvent, workspace_object::WorkspaceObject, Activate, TX}; +use crate::{utils::WorkspaceEvent, workspace_object::WorkspaceObject, TX}; use glib::Object; use gtk4::{glib, prelude::*, subclass::prelude::*, ToggleButton}; diff --git a/applets/cosmic-applet-workspaces/src/workspace_list/imp.rs b/applets/cosmic-applet-workspaces/src/workspace_list/imp.rs index 0fc9bb21..469ca126 100644 --- a/applets/cosmic-applet-workspaces/src/workspace_list/imp.rs +++ b/applets/cosmic-applet-workspaces/src/workspace_list/imp.rs @@ -1,13 +1,9 @@ // SPDX-License-Identifier: MPL-2.0-only -use cosmic_panel_config::CosmicPanelConfig; use gtk4::subclass::prelude::*; -use gtk4::{gio, glib, EventControllerScroll}; +use gtk4::{gio, glib}; use gtk4::{Box, ListView}; use once_cell::sync::OnceCell; -use tokio::sync::mpsc; - -use crate::utils::Activate; #[derive(Debug, Default)] pub struct WorkspaceList { diff --git a/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs b/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs index 7b834a99..68ea9fe3 100644 --- a/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs +++ b/applets/cosmic-applet-workspaces/src/workspace_list/mod.rs @@ -1,6 +1,5 @@ // SPDX-License-Identifier: MPL-2.0-only -use crate::utils::Activate; use crate::utils::WorkspaceEvent; use crate::wayland::State; use crate::workspace_button::WorkspaceButton; @@ -8,7 +7,6 @@ use crate::workspace_object::WorkspaceObject; use crate::TX; use cascade::cascade; use cosmic_panel_config::PanelAnchor; -use cosmic_panel_config::PanelSize; use gtk4::builders::EventControllerScrollBuilder; use gtk4::EventControllerScrollFlags; use gtk4::Inhibit;