From f904c5943665601099bdb424f16b380166d1992e Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 16 Dec 2022 09:52:18 -0500
Subject: [PATCH] fix: use git deps for cctk

---
 applets/cosmic-app-list/Cargo.lock              |  2 ++
 applets/cosmic-app-list/Cargo.toml              |  7 ++-----
 applets/cosmic-app-list/src/toplevel_handler.rs | 14 +++++++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/applets/cosmic-app-list/Cargo.lock b/applets/cosmic-app-list/Cargo.lock
index 2e284273..caacb489 100644
--- a/applets/cosmic-app-list/Cargo.lock
+++ b/applets/cosmic-app-list/Cargo.lock
@@ -413,6 +413,7 @@ dependencies = [
 [[package]]
 name = "cosmic-client-toolkit"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-protocols#77738cba2335c5029da797e8683686e041d84bb8"
 dependencies = [
  "cosmic-protocols",
  "gl_generator",
@@ -438,6 +439,7 @@ dependencies = [
 [[package]]
 name = "cosmic-protocols"
 version = "0.1.0"
+source = "git+https://github.com/pop-os/cosmic-protocols#77738cba2335c5029da797e8683686e041d84bb8"
 dependencies = [
  "bitflags",
  "wayland-backend",
diff --git a/applets/cosmic-app-list/Cargo.toml b/applets/cosmic-app-list/Cargo.toml
index 7b7ca80c..ea0e8873 100644
--- a/applets/cosmic-app-list/Cargo.toml
+++ b/applets/cosmic-app-list/Cargo.toml
@@ -5,12 +5,9 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-cctk = {path = "../../../cosmic-protocols/client-toolkit", package = "cosmic-client-toolkit"}
-# cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"] }
-cosmic-protocols = { path = "../../../cosmic-protocols", default-features = false, features = ["client"] }
-
+cctk = {git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit"}
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"] }
 libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] }
-# libcosmic = { path = "../../../libcosmic", default-features = false, features = ["wayland", "applet"] }
 ron = "0.8"
 futures = "0.3"
 futures-util = "0.3"
diff --git a/applets/cosmic-app-list/src/toplevel_handler.rs b/applets/cosmic-app-list/src/toplevel_handler.rs
index a5b23762..23644f6a 100644
--- a/applets/cosmic-app-list/src/toplevel_handler.rs
+++ b/applets/cosmic-app-list/src/toplevel_handler.rs
@@ -8,9 +8,12 @@ use cctk::{
     },
     toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
     toplevel_management::{ToplevelManagerHandler, ToplevelManagerState},
-    wayland_client,
+    wayland_client::{self, WEnum},
+};
+use cosmic_protocols::{
+    toplevel_info::v1::client::zcosmic_toplevel_handle_v1,
+    toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
 };
-use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1;
 use futures::channel::mpsc::UnboundedSender;
 use sctk::registry::{ProvidesRegistryState, RegistryState};
 use wayland_client::{globals::registry_queue_init, Connection, QueueHandle};
@@ -65,7 +68,12 @@ impl ToplevelManagerHandler for AppData {
         &mut self.toplevel_manager_state
     }
 
-    fn capabilities(&mut self, _: &Connection, _: &QueueHandle<Self>, _: Vec<u8>) {
+    fn capabilities(
+        &mut self,
+        _: &Connection,
+        _: &QueueHandle<Self>,
+        _: Vec<WEnum<zcosmic_toplevel_manager_v1::ZcosmicToplelevelManagementCapabilitiesV1>>,
+    ) {
         // TODO capabilities could affect the options in the applet
     }
 }