Jayden/wayvr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notifications tiny cleanup

Browse Source
This commit is contained in:
galister
2025-12-14 13:10:33 +09:00
parent 3ad5c8cbfd
commit 4bd8cc1955
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wlx-overlay-s/src/subsystem/notifications/mod.rs
View File

@@ -1,6 +1,7 @@
#[allow(clippy::all)] #[allow(clippy::all)]
mod notifications_dbus; mod notifications_dbus;
use anyhow::Context;
use dbus::{ use dbus::{
arg::{PropMap, Variant}, arg::{PropMap, Variant},
blocking::Connection, blocking::Connection,
@@ -55,14 +56,10 @@ impl NotificationManager {
} }
pub fn run_dbus(&mut self) { pub fn run_dbus(&mut self) {
let c = match Connection::new_session() { let Ok(conn) = Connection::new_session().context(
Ok(c) => c, "Failed to connect to dbus. Desktop notifications and keymap changes will not work.",
Err(e) => { ) else {
log::error!( return;
"Failed to connect to dbus. Desktop notifications will not work. Cause: {e:?}"
);
return;
}
}; };
let mut rule = MatchRule::new_method_call(); let mut rule = MatchRule::new_method_call();
@@ -71,7 +68,7 @@ impl NotificationManager {
rule.path = Some("/org/freedesktop/Notifications".into()); rule.path = Some("/org/freedesktop/Notifications".into());
rule.eavesdrop = true; rule.eavesdrop = true;
let proxy = c.with_proxy( let proxy = conn.with_proxy(
"org.freedesktop.DBus", "org.freedesktop.DBus",
"/org/freedesktop/DBus", "/org/freedesktop/DBus",
Duration::from_millis(5000), Duration::from_millis(5000),
@@ -84,7 +81,7 @@ impl NotificationManager {
if matches!(result, Ok(())) { if matches!(result, Ok(())) {
let sender = self.tx_toast.clone(); let sender = self.tx_toast.clone();
c.start_receive( conn.start_receive(
rule, rule,
Box::new(move |msg, _| { Box::new(move |msg, _| {
if let Ok(toast) = parse_dbus(&msg) { if let Ok(toast) = parse_dbus(&msg) {
@@ -107,7 +104,7 @@ impl NotificationManager {
}; };
let sender2 = self.tx_toast.clone(); let sender2 = self.tx_toast.clone();
let result = c.add_match(rule_with_eavesdrop, move |(): (), _, msg| { let result = conn.add_match(rule_with_eavesdrop, move |(): (), _, msg| {
if let Ok(toast) = parse_dbus(msg) { if let Ok(toast) = parse_dbus(msg) {
match sender2.try_send(toast) { match sender2.try_send(toast) {
Ok(()) => {} Ok(()) => {}
@@ -129,7 +126,7 @@ impl NotificationManager {
} }
} }
self.dbus_data = Some(c); self.dbus_data = Some(conn);
} }
pub fn run_udp(&mut self) { pub fn run_udp(&mut self) {