Skip to content

DeviceRow: get adapter internally #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 3 commits into from
Jun 19, 2025
Merged

DeviceRow: get adapter internally #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1963468
DeviceRow: get adapter internally
danirabbit Jun 18, 2025
3d6c347
Merge branch 'main' into danirabbit/devicerow-internaladapter
leonardo-lemos Jun 19, 2025
4ec4475
Merge branch 'main' into danirabbit/devicerow-internaladapter
danirabbit Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/DeviceRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
*/

public class Bluetooth.DeviceRow : Gtk.ListBoxRow {
public signal void status_changed ();

public Services.Device device { get; construct; }
public unowned Services.Adapter adapter { get; construct; }
private static Gtk.SizeGroup size_group;

public signal void status_changed ();
private static Gtk.SizeGroup size_group;

private enum Status {
UNPAIRED,
Expand Down Expand Up @@ -62,8 +62,8 @@ public class Bluetooth.DeviceRow : Gtk.ListBoxRow {
private Gtk.Label state_label;
private Gtk.LinkButton settings_button;

public DeviceRow (Services.Device device, Services.Adapter adapter) {
Object (device: device, adapter: adapter);
public DeviceRow (Services.Device device) {
Object (device: device);
}

static construct {
Expand Down Expand Up @@ -187,6 +187,8 @@ public class Bluetooth.DeviceRow : Gtk.ListBoxRow {
break;
}

var adapter = Services.ObjectManager.get_default ().get_adapter_from_path (device.adapter);

compute_status ();
set_sensitive (adapter.powered);

Expand Down
6 changes: 2 additions & 4 deletions src/MainView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {

private void complete_setup () {
foreach (var device in manager.get_devices ()) {
var adapter = manager.get_adapter_from_path (device.adapter);
var row = new DeviceRow (device, adapter);
var row = new DeviceRow (device);
list_box.append (row);
}

Expand All @@ -100,8 +99,7 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {

/* Now retrieve finished, we can connect manager signals */
manager.device_added.connect ((device) => {
var adapter = manager.get_adapter_from_path (device.adapter);
var row = new DeviceRow (device, adapter);
var row = new DeviceRow (device);
list_box.append (row);
if (list_box.get_selected_row () == null) {
list_box.select_row (row);
Expand Down