leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zbus update

Browse source
This commit is contained in:
Ashley Wulber 2024-05-16 21:29:28 -04:00 • committed by Michael Murphy
parent 2e9660f2a8
commit 87250b5e50
23 changed files with 613 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-applet-network/src/network_manager/available_wifi.rs
View file

@ -41,7 +41,7 @@ pub async fn handle_wireless_device(device: WirelessDevice<'_>) -> zbus::Result<
strength,
state,
working: false,
path: ap.path().to_owned(),
path: ap.inner().path().to_owned(),
},
);
}

16
cosmic-applet-network/src/network_manager/mod.rs
View file

@ -23,7 +23,7 @@ use futures::{
};
use tokio::process::Command;
use zbus::{
zvariant::{self, Value},
zvariant::{self, OwnedValue, Value},
Connection,
};
@ -452,7 +452,9 @@ impl NetworkManagerState {
let map = (
s.0.to_string(),
s.1.iter()
.map(|(k, v)| (k.to_string(), v.clone().into()))
.filter_map(|(k, v)| {
OwnedValue::try_from(v).map(|v| (k.to_string(), v)).ok()
})
.collect::<HashMap<_, _>>(),
);
map
@ -463,15 +465,13 @@ impl NetworkManagerState {
nm.activate_connection(known_conn, &device).await?
} else {
let (_, active_conn) = nm
.add_and_activate_connection(conn_settings, device.path(), &ap.path)
.add_and_activate_connection(conn_settings, device.inner().path(), &ap.path)
.await?;
let dummy = ActiveConnectionProxy::new(&conn).await?;
let dummy = ActiveConnectionProxy::new(&conn, active_conn).await?;
let active = ActiveConnectionProxy::builder(&conn)
.path(active_conn)
.destination(dummy.inner().destination().to_owned())
.unwrap()
.destination(dummy.destination().to_owned())
.unwrap()
.interface(dummy.interface().to_owned())
.interface(dummy.inner().interface().to_owned())
.unwrap()
.build()
.await