applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Simplify function

Browse source
This commit is contained in:
Robert Ancell 2019-10-01 14:27:29 +13:00
parent 3c32ee72ea
commit 1d43f4c0f5
4 changed files with 24 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
panels/network/connection-editor/ce-page-details.c
View file

@ -256,7 +256,7 @@ connect_details_page (CEPageDetails *page)
if (device_is_active) if (device_is_active)
panel_set_device_widgets (CE_PAGE (page)->builder, page->device); panel_set_device_widgets (CE_PAGE (page)->builder, page->device);
else else
panel_unset_device_widgets (CE_PAGE (page)->builder); panel_set_device_widgets (CE_PAGE (page)->builder, NULL);
if (!device_is_active && CE_PAGE (page)->connection) if (!device_is_active && CE_PAGE (page)->connection)
update_last_used (page, CE_PAGE (page)->connection); update_last_used (page, CE_PAGE (page)->connection);

2
panels/network/net-device-wifi.c
View file

@ -578,7 +578,7 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
/* set IP entries */ /* set IP entries */
if (ap != active_ap) if (ap != active_ap)
panel_unset_device_widgets (device_wifi->builder); panel_set_device_widgets (device_wifi->builder, NULL);
else else
panel_set_device_widgets (device_wifi->builder, nm_device); panel_set_device_widgets (device_wifi->builder, nm_device);

88
panels/network/panel-common.c
View file

@ -413,68 +413,33 @@ panel_get_ip6_address_as_string (NMIPConfig *ip6_config)
void void
panel_set_device_widgets (GtkBuilder *builder, NMDevice *device) panel_set_device_widgets (GtkBuilder *builder, NMDevice *device)
{ {
NMIPConfig *ip4_config = NULL; g_autofree gchar *ipv4_text = NULL;
NMIPConfig *ip6_config = NULL; g_autofree gchar *ipv6_text = NULL;
gboolean has_ip4; g_autofree gchar *dns_text = NULL;
gboolean has_ip6; g_autofree gchar *route_text = NULL;
gchar *str_tmp; gboolean has_ip4, has_ip6;
/* get IPv4 parameters */ if (device != NULL) {
ip4_config = nm_device_get_ip4_config (device); NMIPConfig *ip4_config, *ip6_config;
if (ip4_config != NULL) {
/* IPv4 address */ ip4_config = nm_device_get_ip4_config (device);
str_tmp = panel_get_ip4_address_as_string (ip4_config, "address"); if (ip4_config != NULL) {
panel_set_device_widget_details (builder, ipv4_text = panel_get_ip4_address_as_string (ip4_config, "address");
"ipv4", dns_text = panel_get_ip4_dns_as_string (ip4_config);
str_tmp); route_text = panel_get_ip4_address_as_string (ip4_config, "gateway");
has_ip4 = str_tmp != NULL; }
g_free (str_tmp); ip6_config = nm_device_get_ip6_config (device);
if (ip6_config != NULL)
/* IPv4 DNS */ ipv6_text = panel_get_ip6_address_as_string (ip6_config);
str_tmp = panel_get_ip4_dns_as_string (ip4_config);
panel_set_device_widget_details (builder,
"dns",
str_tmp);
g_free (str_tmp);
/* IPv4 route */
str_tmp = panel_get_ip4_address_as_string (ip4_config, "gateway");
panel_set_device_widget_details (builder,
"route",
str_tmp);
g_free (str_tmp);
} else {
/* IPv4 address */
panel_set_device_widget_details (builder,
"ipv4",
NULL);
has_ip4 = FALSE;
/* IPv4 DNS */
panel_set_device_widget_details (builder,
"dns",
NULL);
/* IPv4 route */
panel_set_device_widget_details (builder,
"route",
NULL);
} }
/* get IPv6 parameters */ panel_set_device_widget_details (builder, "ipv4", ipv4_text);
ip6_config = nm_device_get_ip6_config (device); panel_set_device_widget_details (builder, "ipv6", ipv6_text);
if (ip6_config != NULL) { panel_set_device_widget_details (builder, "dns", dns_text);
str_tmp = panel_get_ip6_address_as_string (ip6_config); panel_set_device_widget_details (builder, "route", route_text);
panel_set_device_widget_details (builder, "ipv6", str_tmp);
has_ip6 = str_tmp != NULL;
g_free (str_tmp);
} else {
panel_set_device_widget_details (builder, "ipv6", NULL);
has_ip6 = FALSE;
}
has_ip4 = ipv4_text != NULL;
has_ip6 = ipv6_text != NULL;
if (has_ip4 && has_ip6) { if (has_ip4 && has_ip6) {
panel_set_device_widget_header (builder, "ipv4", _("IPv4 Address")); panel_set_device_widget_header (builder, "ipv4", _("IPv4 Address"));
panel_set_device_widget_header (builder, "ipv6", _("IPv6 Address")); panel_set_device_widget_header (builder, "ipv6", _("IPv6 Address"));
@ -484,12 +449,3 @@ panel_set_device_widgets (GtkBuilder *builder, NMDevice *device)
panel_set_device_widget_header (builder, "ipv6", _("IP Address")); panel_set_device_widget_header (builder, "ipv6", _("IP Address"));
} }
} }
void
panel_unset_device_widgets (GtkBuilder *builder)
{
panel_set_device_widget_details (builder, "ipv4", NULL);
panel_set_device_widget_details (builder, "ipv6", NULL);
panel_set_device_widget_details (builder, "dns", NULL);
panel_set_device_widget_details (builder, "route", NULL);
}

1
panels/network/panel-common.h
View file

@ -33,7 +33,6 @@ gboolean panel_set_device_widget_details (GtkBuilder *buil
const gchar *value); const gchar *value);
void panel_set_device_widgets (GtkBuilder *builder, void panel_set_device_widgets (GtkBuilder *builder,
NMDevice *device); NMDevice *device);
void panel_unset_device_widgets (GtkBuilder *builder);
gchar *panel_get_ip4_address_as_string (NMIPConfig *config, const gchar *what); gchar *panel_get_ip4_address_as_string (NMIPConfig *config, const gchar *what);
gchar *panel_get_ip4_dns_as_string (NMIPConfig *config); gchar *panel_get_ip4_dns_as_string (NMIPConfig *config);
gchar *panel_get_ip6_address_as_string (NMIPConfig *config); gchar *panel_get_ip6_address_as_string (NMIPConfig *config);