fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-02 03:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: nmtui/slave-list: s/master/controller/

Browse source
This commit is contained in:
Lubomir Rintel 2023-01-17 18:51:29 +01:00
parent 4948e6a448
commit 8454ccbbfb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/nmtui/nmt-slave-list.c
View file

@ -98,7 +98,7 @@ nmt_slave_list_connection_filter(NmtEditConnectionList *list,
{
NmtSlaveListPrivate *priv = NMT_SLAVE_LIST_GET_PRIVATE(list);
NMSettingConnection *s_con;
const char *master, *master_ifname, *slave_type;
const char *controller, *controller_ifname, *slave_type;
s_con = nm_connection_get_setting_connection(connection);
g_return_val_if_fail(s_con != NULL, FALSE);
@ -107,12 +107,13 @@ nmt_slave_list_connection_filter(NmtEditConnectionList *list,
if (g_strcmp0(slave_type, priv->master_type) != 0)
return FALSE;
master = nm_setting_connection_get_controller(s_con);
if (!master)
controller = nm_setting_connection_get_controller(s_con);
if (!controller)
return FALSE;
master_ifname = nm_connection_get_interface_name(priv->master);
if (g_strcmp0(master, master_ifname) != 0 && g_strcmp0(master, priv->master_uuid) != 0)
controller_ifname = nm_connection_get_interface_name(priv->master);
if (g_strcmp0(controller, controller_ifname) != 0
&& g_strcmp0(controller, priv->master_uuid) != 0)
return FALSE;
return TRUE;