Skip to content

Fix/crash #331

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

Open
anzyelay wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix/crash #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a8284ca
fix reconnecting while set switchbutton to unactive
Nov 26, 2021
83c3984
Merge branch 'master' into fix/reconnecting
anzyelay Nov 26, 2021
0262d75
Merge branch 'master' into fix/reconnecting
anzyelay Dec 3, 2021
b4fa3bf
Update src/Widgets/Page.vala
anzyelay Dec 14, 2021
a4bc5bb
remove the commented out code
anzyelay Dec 14, 2021
4547446
remove the commented out code, add default case
anzyelay Dec 14, 2021
5603d6a
fix reopen plug crash when a usb-network was removed
Dec 14, 2021
b4772af
fix elementary code sytle
Dec 14, 2021
92ad928
Merge branch 'master' into fix/crash
anzyelay Dec 14, 2021
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
9 changes: 8 additions & 1 deletion src/Utils.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,14 @@ namespace Network {
public enum ItemType {
DEVICE = 0,
VIRTUAL,
INVALID
INVALID;
public string to_string () {
switch (this) {
case DEVICE: return _("Devices");
case VIRTUAL: return _("Virtual");
default: return _("Invalid");
}
}
}

public static string state_to_string (NM.DeviceState state) {
Expand Down
34 changes: 2 additions & 32 deletions src/Widgets/DeviceList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,13 @@ namespace Network.Widgets {
public class DeviceList : Gtk.ListBox {
public signal void show_no_devices (bool show);

private Gtk.Label virtual_l;
private Gtk.Label devices_l;
private DeviceItem proxy;
private DeviceItem vpn;

construct {
selection_mode = Gtk.SelectionMode.SINGLE;
activate_on_single_click = true;

virtual_l = new Gtk.Label (_("Virtual")) {
halign = Gtk.Align.START
};
virtual_l.get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);

devices_l = new Gtk.Label (_("Devices")) {
halign = Gtk.Align.START
};
devices_l.get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);

set_header_func (update_headers);
set_sort_func (sort_items);

Expand Down Expand Up @@ -140,28 +128,10 @@ namespace Network.Widgets {
private void update_headers (Gtk.ListBoxRow row, Gtk.ListBoxRow? before = null) {
unowned DeviceItem row_item = (DeviceItem) row;
unowned DeviceItem? before_item = (DeviceItem) before;
if (row_item.item_type == Utils.ItemType.VIRTUAL) {
if (before_item != null && before_item.item_type == Utils.ItemType.VIRTUAL) {
row.set_header (null);
return;
}

if (virtual_l.get_parent () != null) {
virtual_l.unparent ();
}

row.set_header (virtual_l);
} else if (row_item.item_type == Utils.ItemType.DEVICE) {
if (before_item != null && before_item.item_type == Utils.ItemType.DEVICE) {
row.set_header (null);
return;
}

if (devices_l.get_parent () != null) {
devices_l.unparent ();
}

row.set_header (devices_l);
if (before_item == null || row_item.item_type != before_item.item_type) {
row.set_header (new Granite.HeaderLabel (row_item.item_type.to_string ()));
} else {
row.set_header (null);
}
Expand Down