diff --git a/Cargo.lock b/Cargo.lock index 289fbcb..f493607 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,24 +968,9 @@ dependencies = [ [[package]] name = "re_set-lib" -version = "3.1.7" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1777735e2eb0461dd531b5b2bf74900d068046d25af7385830106bd5bb44bf00" -dependencies = [ - "dbus", - "dbus-crossroads", - "directories-next", - "gtk4", - "libloading", - "libpulse-binding", - "once_cell", - "serial_test", -] - -[[package]] -name = "re_set-lib" -version = "3.1.11" -source = "git+https://github.com/Xetibo/ReSet-Lib?branch=audioobject#6da871ec1fa7c52277b70065ccbcfbe6d12073a6" +checksum = "386bc67e1c4bce0c8fd01eb2999e60b34b83c86f635db38cbbc39890d1cb248f" dependencies = [ "dbus", "dbus-crossroads", @@ -995,6 +980,7 @@ dependencies = [ "libpulse-binding", "once_cell", "serial_test", + "toml", ] [[package]] @@ -1028,15 +1014,16 @@ dependencies = [ "gtk4", "ipnetwork", "libadwaita", - "re_set-lib 3.1.11", + "re_set-lib", "reset_daemon", "tokio", ] [[package]] name = "reset_daemon" -version = "1.1.0" -source = "git+https://github.com/Xetibo/ReSet-Daemon?branch=dashie#26abc95a72ff1b5f515bdfbb82f3bfabfe8ba8f7" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa262cbdbb8408260b960764ed612d249b165bb9cde76633a5856c587ef5a21" dependencies = [ "crossbeam", "dbus", @@ -1045,9 +1032,10 @@ dependencies = [ "libloading", "libpulse-binding", "once_cell", - "re_set-lib 3.1.7", + "re_set-lib", "serial_test", "tokio", + "toml", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3ad810d..9b2ad2f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "reset" -version = "1.0.0" +version = "1.1.0" edition = "2021" description = "A wip universal Linux settings application." repository = "https://github.com/Xetibo/ReSet" license = "GPL-3.0-or-later" [dependencies] -# reset_daemon = "1.1.0" -re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" , branch = "audioobject"} -# re_set-lib = "3.1.7" -reset_daemon = { git = "https://github.com/Xetibo/ReSet-Daemon", branch = "dashie" } +#reset_daemon = { git = "https://github.com/Xetibo/ReSet-Daemon", branch = "dashie" } +reset_daemon = "1.2.0" +#re_set-lib = { git = "https://github.com/Xetibo/ReSet-Lib" , branch = "audioobject"} +re_set-lib = "3.2.0" adw = { version = "0.6.0", package = "libadwaita", features = ["v1_4"] } dbus = "0.9.7" gtk = { version = "0.8.1", package = "gtk4", features = ["v4_12"] } diff --git a/src/components/audio/audio_box_handlers.rs b/src/components/audio/audio_box_handlers.rs index 0cbde61..182b0b0 100644 --- a/src/components/audio/audio_box_handlers.rs +++ b/src/components/audio/audio_box_handlers.rs @@ -6,8 +6,7 @@ use std::{ use adw::prelude::{ComboRowExt, PreferencesRowExt}; use dbus::arg::{Arg, Get}; use glib::{ - object::{Cast, IsA, ObjectExt}, - property::PropertyGet, + object::{Cast, IsA}, ControlFlow, Propagation, }; use gtk::{ diff --git a/src/main.rs b/src/main.rs index 109cf76..887c5e9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -68,6 +68,6 @@ async fn daemon_check() { }); let res = handle.join(); if res.unwrap().is_err() { - run_daemon(vec![String::from("ina")]).await; + run_daemon().await; } }