Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-11-04 01:35:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Don't readd wifi adapter after turning off wifi

Browse source
This commit is contained in:
dashie 2023-12-11 13:52:33 +00:00
parent 323aab4aa8
commit a5c4a335c5
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/bluetooth/bluetooth_entry.rs
View file

@ -48,8 +48,10 @@ impl BluetoothEntry {
entry.add_prefix(&Image::from_icon_name(&device.icon)); entry.add_prefix(&Image::from_icon_name(&device.icon));
} }
if device.connected || device.bonded { if device.connected || device.bonded {
println!("was bonded");
entry_imp.remove_device_button.borrow().set_sensitive(true); entry_imp.remove_device_button.borrow().set_sensitive(true);
} else { } else {
dbg!(&device);
entry_imp.remove_device_button.borrow().set_sensitive(false); entry_imp.remove_device_button.borrow().set_sensitive(false);
} }

5
src/components/wifi/wifi_box.rs
View file

@ -17,7 +17,7 @@ use dbus::Path;
use glib::{clone, Cast, PropertySet}; use glib::{clone, Cast, PropertySet};
use gtk::glib::Variant; use gtk::glib::Variant;
use gtk::prelude::{ActionableExt, WidgetExt}; 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::network::network_structures::{AccessPoint, WifiDevice, WifiStrength};
use re_set_lib::signals::{AccessPointAdded, WifiDeviceChanged}; use re_set_lib::signals::{AccessPointAdded, WifiDeviceChanged};
use re_set_lib::signals::{AccessPointChanged, AccessPointRemoved}; use re_set_lib::signals::{AccessPointChanged, AccessPointRemoved};
@ -68,6 +68,9 @@ fn setup_callbacks(listeners: Arc<Listeners>, wifi_box: Arc<WifiBox>) -> Arc<Wif
clone!(@weak imp => @default-return glib::Propagation::Proceed, move |_, value| { clone!(@weak imp => @default-return glib::Propagation::Proceed, move |_, value| {
set_wifi_enabled(value); set_wifi_enabled(value);
if !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(); let mut map = imp.wifi_entries.lock().unwrap();
for entry in map.iter() { for entry in map.iter() {
imp.reset_wifi_list.remove(&*(*entry.1)); imp.reset_wifi_list.remove(&*(*entry.1));