From a5c4a335c58710e2fd2570a423fcb3e97a8e3164 Mon Sep 17 00:00:00 2001 From: dashie Date: Mon, 11 Dec 2023 13:52:33 +0000 Subject: [PATCH 1/2] fix: Don't readd wifi adapter after turning off wifi --- src/components/bluetooth/bluetooth_entry.rs | 2 ++ src/components/wifi/wifi_box.rs | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/bluetooth/bluetooth_entry.rs b/src/components/bluetooth/bluetooth_entry.rs index a095be5..dbb3d7c 100644 --- a/src/components/bluetooth/bluetooth_entry.rs +++ b/src/components/bluetooth/bluetooth_entry.rs @@ -48,8 +48,10 @@ impl BluetoothEntry { entry.add_prefix(&Image::from_icon_name(&device.icon)); } if device.connected || device.bonded { + println!("was bonded"); entry_imp.remove_device_button.borrow().set_sensitive(true); } else { + dbg!(&device); entry_imp.remove_device_button.borrow().set_sensitive(false); } diff --git a/src/components/wifi/wifi_box.rs b/src/components/wifi/wifi_box.rs index 249be64..f9ac38c 100644 --- a/src/components/wifi/wifi_box.rs +++ b/src/components/wifi/wifi_box.rs @@ -17,7 +17,7 @@ use dbus::Path; use glib::{clone, Cast, PropertySet}; use gtk::glib::Variant; use gtk::prelude::{ActionableExt, WidgetExt}; -use gtk::{gio, StringObject}; +use gtk::{gio, StringObject, StringList}; use re_set_lib::network::network_structures::{AccessPoint, WifiDevice, WifiStrength}; use re_set_lib::signals::{AccessPointAdded, WifiDeviceChanged}; use re_set_lib::signals::{AccessPointChanged, AccessPointRemoved}; @@ -68,6 +68,9 @@ fn setup_callbacks(listeners: Arc, wifi_box: Arc) -> Arc @default-return glib::Propagation::Proceed, move |_, value| { set_wifi_enabled(value); if !value { + imp.reset_wifi_devices.write().unwrap().clear(); + *imp.reset_model_list.write().unwrap() = StringList::new(&[]); + *imp.reset_model_index.write().unwrap() = 0; let mut map = imp.wifi_entries.lock().unwrap(); for entry in map.iter() { imp.reset_wifi_list.remove(&*(*entry.1)); From 4ce01688f906bf087c55837661cd32778c6dcf56 Mon Sep 17 00:00:00 2001 From: dashie Date: Mon, 11 Dec 2023 16:32:27 +0000 Subject: [PATCH 2/2] chore: Remove unused println --- src/components/bluetooth/bluetooth_entry.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/bluetooth/bluetooth_entry.rs b/src/components/bluetooth/bluetooth_entry.rs index dbb3d7c..a095be5 100644 --- a/src/components/bluetooth/bluetooth_entry.rs +++ b/src/components/bluetooth/bluetooth_entry.rs @@ -48,10 +48,8 @@ impl BluetoothEntry { entry.add_prefix(&Image::from_icon_name(&device.icon)); } if device.connected || device.bonded { - println!("was bonded"); entry_imp.remove_device_button.borrow().set_sensitive(true); } else { - dbg!(&device); entry_imp.remove_device_button.borrow().set_sensitive(false); }