bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00
Code Issues Releases Wiki Activity

[PM-23159] Update arboard and enable exclude from history on Linux (#15393)

Browse Source
This commit is contained in:
Daniel García
2025-07-10 19:17:13 +02:00
committed by GitHub
parent 8135e840ab
commit 318040233c
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/desktop_native/Cargo.lock generated
View File

@@ -120,9 +120,9 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
[[package]] [[package]]
name = "arboard" name = "arboard"
version = "3.5.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70" checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
dependencies = [ dependencies = [
"clipboard-win", "clipboard-win",
"log", "log",

2
apps/desktop/desktop_native/Cargo.toml
View File

@@ -11,7 +11,7 @@ publish = false
[workspace.dependencies] [workspace.dependencies]
aes = "=0.8.4" aes = "=0.8.4"
anyhow = "=1.0.94" anyhow = "=1.0.94"
arboard = { version = "=3.5.0", default-features = false } arboard = { version = "=3.6.0", default-features = false }
argon2 = "=0.5.3" argon2 = "=0.5.3"
ashpd = "=0.11.0" ashpd = "=0.11.0"
base64 = "=0.22.1" base64 = "=0.22.1"

8
apps/desktop/desktop_native/core/src/clipboard.rs
View File

@@ -30,10 +30,14 @@ fn clipboard_set(set: Set, password: bool) -> Set {
// Wait for clipboard to be available on linux // Wait for clipboard to be available on linux
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn clipboard_set(set: Set, _password: bool) -> Set { fn clipboard_set(set: Set, password: bool) -> Set {
use arboard::SetExtLinux; use arboard::SetExtLinux;
set.wait() if password {
set.exclude_from_history().wait()
} else {
set.wait()
}
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]