update deps and cleanup

This commit is contained in:
Ashley Wulber 2023-11-13 10:38:28 -05:00 committed by Ashley Wulber
parent 37cc1aa4b1
commit ed2ab8d91a
5 changed files with 294 additions and 269 deletions

547
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -46,6 +46,3 @@ lto = "thin"
# cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-config = { path = "../libcosmic/cosmic-config" }
[patch."https://github.com/Smithay/client-toolkit"] [patch."https://github.com/Smithay/client-toolkit"]
sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" } sctk = { git = "https://github.com/smithay/client-toolkit//", package = "smithay-client-toolkit", rev = "e63ab5f" }
[patch."https://github.com/pop-os/dbus-settings-bindings"]
zbus ="3.14"

View file

@ -1,9 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
use cosmic_dbus_networkmanager::{ use cosmic_dbus_networkmanager::{
active_connection::ActiveConnection, active_connection::ActiveConnection, device::SpecificDevice,
device::SpecificDevice, interface::enums::ActiveConnectionState,
interface::enums::{ActiveConnectionState, ApFlags, ApSecurityFlags},
}; };
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
@ -52,9 +51,6 @@ pub async fn active_connections(
name: String::from_utf8_lossy(&access_point.ssid().await?).into_owned(), name: String::from_utf8_lossy(&access_point.ssid().await?).into_owned(),
ip_addresses: addresses.clone(), ip_addresses: addresses.clone(),
hw_address: wireless_device.hw_address().await?, hw_address: wireless_device.hw_address().await?,
flags: access_point.flags().await?,
rsn_flags: access_point.rsn_flags().await?,
wpa_flags: access_point.wpa_flags().await?,
state, state,
strength: access_point.strength().await.unwrap_or_default(), strength: access_point.strength().await.unwrap_or_default(),
}); });
@ -95,9 +91,6 @@ pub enum ActiveConnectionInfo {
name: String, name: String,
ip_addresses: Vec<Ipv4Addr>, ip_addresses: Vec<Ipv4Addr>,
hw_address: String, hw_address: String,
flags: ApFlags,
rsn_flags: ApSecurityFlags,
wpa_flags: ApSecurityFlags,
state: ActiveConnectionState, state: ActiveConnectionState,
strength: u8, strength: u8,
}, },

View file

@ -9,7 +9,6 @@ gaps = Välit
floating-window-exceptions = Leijuvien ikkunoiden poikkeukset... floating-window-exceptions = Leijuvien ikkunoiden poikkeukset...
window-management-settings = Ikkunanhallinan asetukset... window-management-settings = Ikkunanhallinan asetukset...
// Commands
super = Super super = Super
shift = Shift shift = Shift
arrow-keys = arrows arrow-keys = arrows

View file

@ -9,7 +9,6 @@ gaps = Marges
floating-window-exceptions = Exceptions des fenêtres flottantes... floating-window-exceptions = Exceptions des fenêtres flottantes...
window-management-settings = Paramètres d'agencement des fenêtres... window-management-settings = Paramètres d'agencement des fenêtres...
// Commands
super = Super super = Super
shift = Shift shift = Shift
arrow-keys = arrows arrow-keys = arrows