Merge tag 'epoch-1.8.0' into yoda-dock-magnification

Epoch 1.8.0

# Conflicts:
#	Cargo.lock
This commit is contained in:
Lionel DARNIS 2026-09-10 17:57:28 +02:00
commit 1f736cdb30
22 changed files with 391 additions and 205 deletions

View file

@ -26,4 +26,4 @@ tracing.workspace = true
indexmap = "2.13.0"
secure-string = "0.3.0"
uuid = { version = "1.21.0", features = ["v4"] }
nmrs = "3.4.0"
nmrs = "3.5.2"

View file

@ -1,7 +1,7 @@
use indexmap::IndexMap;
use nmrs::{
ActiveConnection, ActiveConnectionState, ConnectType, ConnectivityState, EapOptions,
NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
ActiveConnection, ActiveConnectionState, ConnectByUuidConfig, ConnectType, ConnectivityState,
EapOptions, NetworkEvent, NetworkManager as NmrsManager, NetworkSnapshot, WifiSecurity,
agent::{SecretAgent, SecretAgentCapabilities, SecretRequest, SecretResponder, SecretSetting},
};
use rustc_hash::FxHashSet;
@ -916,7 +916,7 @@ impl CosmicNetworkApplet {
cosmic::task::future(async move {
let error = match NmrsManager::new().await {
Ok(nm) => nm
.connect_vpn_by_uuid(&uuid)
.connect_by_uuid(&uuid, ConnectByUuidConfig::default())
.await
.err()
.map(|e| format!("activate VPN {uuid}: {e}")),
@ -1318,7 +1318,7 @@ impl cosmic::Application for CosmicNetworkApplet {
let disconnect_task = cosmic::task::future(async move {
let error = match NmrsManager::new().await {
Ok(nm) => nm
.disconnect_vpn_by_uuid(&uuid)
.disconnect_by_uuid(&uuid)
.await
.err()
.map(|e| format!("disconnect VPN {uuid}: {e}")),