mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-03-01 19:40:44 +01:00
WIP: nmtui/edit: s/master/controller/
This commit is contained in:
parent
812ac09260
commit
4948e6a448
1 changed files with 7 additions and 7 deletions
|
|
@ -49,17 +49,17 @@ edit_connection_list_filter(NmtEditConnectionList *list,
|
|||
gpointer user_data)
|
||||
{
|
||||
NMSettingConnection *s_con;
|
||||
const char *master, *slave_type;
|
||||
const char *controller, *slave_type;
|
||||
const char *uuid, *ifname;
|
||||
const GPtrArray *conns;
|
||||
int i;
|
||||
gboolean found_master = FALSE;
|
||||
gboolean found_controller = FALSE;
|
||||
|
||||
s_con = nm_connection_get_setting_connection(connection);
|
||||
g_return_val_if_fail(s_con != NULL, FALSE);
|
||||
|
||||
master = nm_setting_connection_get_controller(s_con);
|
||||
if (!master)
|
||||
controller = nm_setting_connection_get_controller(s_con);
|
||||
if (!controller)
|
||||
return TRUE;
|
||||
slave_type = nm_setting_connection_get_slave_type(s_con);
|
||||
if (g_strcmp0(slave_type, NM_SETTING_BOND_SETTING_NAME) != 0
|
||||
|
|
@ -73,13 +73,13 @@ edit_connection_list_filter(NmtEditConnectionList *list,
|
|||
|
||||
uuid = nm_connection_get_uuid(candidate);
|
||||
ifname = nm_connection_get_interface_name(candidate);
|
||||
if (!g_strcmp0(master, uuid) || !g_strcmp0(master, ifname)) {
|
||||
found_master = TRUE;
|
||||
if (!g_strcmp0(controller, uuid) || !g_strcmp0(controller, ifname)) {
|
||||
found_controller = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return !found_master;
|
||||
return !found_controller;
|
||||
}
|
||||
|
||||
static NmtNewtForm *
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue