diff --git a/ntfy-daemon/src/credentials.rs b/ntfy-daemon/src/credentials.rs index 4afe5d0..d11db09 100644 --- a/ntfy-daemon/src/credentials.rs +++ b/ntfy-daemon/src/credentials.rs @@ -1,4 +1,4 @@ -use std::cell::{Cell, RefCell}; +use std::cell::RefCell; use std::collections::HashMap; use std::rc::Rc; diff --git a/ntfy-daemon/src/lib.rs b/ntfy-daemon/src/lib.rs index 4840b8c..b66af27 100644 --- a/ntfy-daemon/src/lib.rs +++ b/ntfy-daemon/src/lib.rs @@ -8,7 +8,6 @@ pub mod ntfy_capnp { include!(concat!(env!("OUT_DIR"), "/src/ntfy_capnp.rs")); } -use std::rc::Rc; use std::sync::Arc; #[derive(Clone)] diff --git a/ntfy-daemon/src/system_client.rs b/ntfy-daemon/src/system_client.rs index fb11da8..2285ede 100644 --- a/ntfy-daemon/src/system_client.rs +++ b/ntfy-daemon/src/system_client.rs @@ -1,4 +1,4 @@ -use std::cell::{Cell, OnceCell, RefCell}; +use std::cell::{Cell, RefCell}; use std::ops::ControlFlow; use std::rc::{Rc, Weak}; use std::sync::Arc; @@ -20,7 +20,7 @@ use crate::SharedEnv; use crate::{ message_repo::Db, models::{self, MinMessage}, - ntfy_capnp::{account, output_channel, subscription, system_notifier, watch_handle, Status}, + ntfy_capnp::{output_channel, subscription, system_notifier, watch_handle, Status}, topic_listener::{build_client, TopicListener}, }; diff --git a/ntfy-daemon/src/topic_listener.rs b/ntfy-daemon/src/topic_listener.rs index da68be4..c1041c8 100644 --- a/ntfy-daemon/src/topic_listener.rs +++ b/ntfy-daemon/src/topic_listener.rs @@ -1,10 +1,8 @@ -use std::collections::HashMap; use std::ops::ControlFlow; use std::sync::Arc; use std::time::Duration; use futures::prelude::*; -use reqwest::header::HeaderValue; use serde::{Deserialize, Serialize}; use tokio::io::AsyncBufReadExt; use tokio::sync::mpsc; diff --git a/src/application.rs b/src/application.rs index 82d98ab..8930b01 100644 --- a/src/application.rs +++ b/src/application.rs @@ -133,7 +133,7 @@ impl NotifyApplication { }) .build(); - let action_about = gio::ActionEntry::builder("preferences") + let action_preferences = gio::ActionEntry::builder("preferences") .activate(|app: &Self, _, _| { app.show_preferences(); }) @@ -156,7 +156,12 @@ impl NotifyApplication { app.handle_message_action(action); }) .build(); - self.add_action_entries([action_quit, action_about, message_action]); + self.add_action_entries([ + action_quit, + action_about, + action_preferences, + message_action, + ]); } fn handle_message_action(&self, action: models::Action) { diff --git a/src/widgets/preferences.rs b/src/widgets/preferences.rs index 16cd64e..1de5ccd 100644 --- a/src/widgets/preferences.rs +++ b/src/widgets/preferences.rs @@ -1,17 +1,10 @@ -use std::cell::Cell; use std::cell::OnceCell; use adw::prelude::*; use adw::subclass::prelude::*; -use futures::prelude::*; use gtk::{gio, glib}; -use ntfy_daemon::models; -use ntfy_daemon::ntfy_capnp::{system_notifier, Status}; -use tracing::warn; +use ntfy_daemon::ntfy_capnp::system_notifier; -use crate::application::NotifyApplication; -use crate::config::{APP_ID, PROFILE}; -use crate::subscription::Subscription; use crate::widgets::*; mod imp { @@ -157,7 +150,7 @@ impl NotifyPreferences { acc.set_server(server[..].into()); req.get().set_password(password[..].into()); - let res = req.send().promise.await?; + req.send().promise.await?; self.show_accounts().await?;