From bd3059ca564201e98edc23c02abb751de005ab95 Mon Sep 17 00:00:00 2001
From: Fabio Lenherr / DashieTM <fabio.lenherr@gmail.com>
Date: Fri, 10 Nov 2023 18:59:13 +0100
Subject: [PATCH] fix: Use Type instead of event

---
 Cargo.toml   |  2 +-
 src/utils.rs | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 304c87e..87b4d2f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ReSet-Lib"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2021"
 description = "Data structure library for ReSet"
 repository = "https://github.com/Xetibo/ReSet-Lib"
diff --git a/src/utils.rs b/src/utils.rs
index db16749..2548d04 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -92,20 +92,19 @@ pub fn call_reset_dbus_method<
     result
 }
 
-pub enum Events<
-    AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs,
-    RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs,
-> {
-    AddedEvent(AddedEvent),
-    RemovedEvent(RemovedEvent),
+pub enum Events<AddedType: ReadAll + AppendAll, RemovedType: ReadAll + AppendAll> {
+    AddedEvent(AddedType),
+    RemovedEvent(RemovedType),
 }
 
 pub fn start_event_listener<
-    AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + Send + Sync + GetVal<AddedEvent> + 'static,
-    RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + Send + Sync + GetVal<RemovedEvent> + 'static,
+    AddedType: ReadAll + AppendAll + Send + Sync + 'static,
+    RemovedType: ReadAll + AppendAll + Send + Sync + 'static,
+    AddedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + GetVal<AddedType>,
+    RemovedEvent: ReadAll + AppendAll + dbus::message::SignalArgs + GetVal<RemovedType>,
 >(
     active_listener: Arc<AtomicBool>,
-    sender: Arc<Sender<Events<AddedEvent, RemovedEvent>>>,
+    sender: Arc<Sender<Events<AddedType, RemovedType>>>,
 ) -> Result<(), dbus::Error> {
     thread::spawn(move || {
         let added_sender = sender.clone();