diff --git a/Cargo.toml b/Cargo.toml index 97132c2..1412c38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ pki-types = { package = "rustls-pki-types", version = "1.0", features = [ "alloc", ] } tokio-rustls = { version = "0.25" } -env_logger = "0.10.1" +env_logger = "0.11" log = "0.4.20" tokio = { version = "1.34.0", features = ["full", "tracing"] } webpki-roots = "0.26.0" @@ -28,7 +28,10 @@ nom = "7.1.3" managesieve = { path = "../managesieve" } anyhow = "1.0" thiserror = "1.0" -gtk4 = { version = "0.7", features = ["gnome_45", "blueprint"] } +gtk = { version = "0.7", package = "gtk4", features = [ + "gnome_45", + "blueprint", +] } serde = { version = "1.0.193", features = ["derive"] } libadwaita = { version = "0.5.3", features = ["gtk_v4_10", "v1_4"] } gtk-blueprint = "0.2" diff --git a/src/bin/gui/main_window.rs b/src/bin/gui/main_window.rs index 1cd794c..5f41f66 100644 --- a/src/bin/gui/main_window.rs +++ b/src/bin/gui/main_window.rs @@ -5,7 +5,6 @@ use gtk::{ prelude::{ApplicationExt, GtkWindowExt}, Application, }; -use gtk4 as gtk; use gtk_blueprint::get_blp; use libadwaita::prelude::{PreferencesGroupExt, PreferencesRowExt}; use tracing::trace; diff --git a/src/bin/sieverman.rs b/src/bin/sieverman.rs index 912f954..8587989 100644 --- a/src/bin/sieverman.rs +++ b/src/bin/sieverman.rs @@ -3,7 +3,7 @@ mod gui; pub mod protocol; use std::{cell::RefCell, rc::Rc, thread, time::Duration}; -use gtk4::{glib, prelude::ApplicationExtManual as _}; +use gtk::{glib, prelude::ApplicationExtManual as _}; use tracing::{info, trace}; gtk_blueprint::gen_blp_map!("gui"); @@ -16,7 +16,7 @@ fn main() -> glib::ExitCode { .server_addr(([127, 0, 0, 1], 6669)) .init(); - gtk4::init().expect("Failed to initialize GTK"); + gtk::init().expect("Failed to initialize GTK"); libadwaita::init().expect("Adwaita initialization failed"); let (to_frontent_tx, from_backend_rx) = tokio::sync::mpsc::channel(5);