From 0c78f45ac86aead583e05a1b96cd5c22a2d020ae Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Wed, 17 May 2023 19:43:57 -0300 Subject: [PATCH] fix notification windows7 compat impl --- Cargo.lock | 14 +++++++------- plugins/notification/src/desktop.rs | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a12b8d9..266a3c38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4960,7 +4960,7 @@ dependencies = [ [[package]] name = "tauri" version = "2.0.0-alpha.8" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "anyhow", "bytes 1.4.0", @@ -5010,7 +5010,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "anyhow", "cargo_toml", @@ -5030,7 +5030,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "base64 0.21.0", "brotli", @@ -5055,7 +5055,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -5449,7 +5449,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "gtk", "http", @@ -5469,7 +5469,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "cocoa", "gtk", @@ -5489,7 +5489,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=next#994e4fd6d9e649e0d76124cd6fcd18443ac585b0" +source = "git+https://github.com/tauri-apps/tauri?branch=next#8ce32e74b5573931c3bc81e8e893a6d3b9686b0e" dependencies = [ "aes-gcm 0.10.1", "brotli", diff --git a/plugins/notification/src/desktop.rs b/plugins/notification/src/desktop.rs index 81473489..e99773bd 100644 --- a/plugins/notification/src/desktop.rs +++ b/plugins/notification/src/desktop.rs @@ -243,7 +243,7 @@ mod imp { #[cfg(all(windows, feature = "windows7-compat"))] fn notify_win7(self, app: &tauri::AppHandle) -> crate::Result<()> { let app = app.clone(); - let default_window_icon = app.manager.inner.default_window_icon.clone(); + let default_window_icon = app.default_window_icon().clone(); let _ = app.run_on_main_thread(move || { let mut notification = win7_notifications::Notification::new(); if let Some(body) = self.body {