Skip to content

Indicator: get interfaces from list, not widget #261

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
Feb 16, 2023
Merged

Indicator: get interfaces from list, not widget #261

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
b58ca3b
Indicator: get interfaces from list, not widget
danirabbit Feb 15, 2023
4b7e511
Merge branch 'master' into indicator-getifacelist
danirabbit Feb 16, 2023
57690e5
Merge branch 'master' into indicator-getifacelist
danirabbit Feb 16, 2023
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: 6 additions & 6 deletions src/Indicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ public class Network.Indicator : Wingpanel.Indicator {
}

private string get_active_wired_name () {
foreach (unowned Gtk.Widget child in popover_widget.other_box.get_children ()) {
if (child is Network.EtherInterface) {
var active_wired_name = ((Network.EtherInterface) child).display_title;
foreach (unowned var iface in popover_widget.network_interface) {
if (iface is Network.EtherInterface) {
var active_wired_name = iface.display_title;
debug ("Active network (Wired): %s".printf (active_wired_name));
return active_wired_name;
}
Expand All @@ -192,9 +192,9 @@ public class Network.Indicator : Wingpanel.Indicator {
}

private string get_active_wifi_name () {
foreach (unowned Gtk.Widget child in popover_widget.wifi_box.get_children ()) {
if (child is Network.WifiInterface) {
var active_wifi_name = ((Network.WifiInterface) child).active_ap_name;
foreach (unowned var iface in popover_widget.network_interface) {
if (iface is WifiInterface) {
var active_wifi_name = ((Network.WifiInterface) iface).active_ap_name;
debug ("Active network (WiFi): %s".printf (active_wifi_name));
return active_wifi_name;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Widgets/PopoverWidget.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ public class Network.Widgets.PopoverWidget : Gtk.Grid {
public NM.Client nm_client { get; construct; }
private NM.VpnConnection? active_vpn_connection = null;

private GLib.List<WidgetNMInterface>? network_interface;
public GLib.List<WidgetNMInterface>? network_interface { get; private owned set; }

public bool secure { private set; get; default = false; }
public string? extra_info { private set; get; default = null; }
public Network.State state { private set; get; default = Network.State.CONNECTING_WIRED; }

public Gtk.Box other_box { get; private set; }
public Gtk.Box wifi_box { get; private set; }
private Gtk.Box other_box;
private Gtk.Box wifi_box;
private Gtk.Box vpn_box;
private Gtk.ModelButton hidden_item;

Expand Down