[gnome-control-center] network: Rename widget IDs to standard names
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Rename widget IDs to standard names
- Date: Tue, 22 Oct 2019 20:17:42 +0000 (UTC)
commit b331d75df5b1bce5222ff5a722037af4566d15ca
Author: Robert Ancell <robert ancell canonical com>
Date: Tue Oct 15 12:34:44 2019 +1300
network: Rename widget IDs to standard names
.../connection-editor/8021x-security-page.ui | 8 +-
.../connection-editor/ce-page-8021x-security.c | 8 +-
panels/network/connection-editor/ce-page-details.c | 42 +++++-----
.../network/connection-editor/ce-page-ethernet.c | 10 +--
panels/network/connection-editor/ce-page-ip4.c | 38 ++++-----
panels/network/connection-editor/ce-page-ip6.c | 42 +++++-----
.../network/connection-editor/ce-page-security.c | 6 +-
panels/network/connection-editor/ce-page-vpn.c | 2 +-
panels/network/connection-editor/ce-page-wifi.c | 22 ++---
panels/network/connection-editor/details-page.ui | 56 ++++++-------
panels/network/connection-editor/ethernet-page.ui | 22 ++---
panels/network/connection-editor/ip4-page.ui | 24 +++---
panels/network/connection-editor/ip6-page.ui | 28 +++----
panels/network/connection-editor/security-page.ui | 8 +-
panels/network/connection-editor/vpn-page.ui | 4 +-
panels/network/connection-editor/wifi-page.ui | 16 ++--
panels/network/net-device-ethernet.c | 8 +-
panels/network/net-device-mobile.c | 44 +++++-----
panels/network/net-device-simple.c | 8 +-
panels/network/net-device-wifi.c | 30 +++----
panels/network/net-proxy.c | 28 +++----
panels/network/net-vpn.c | 8 +-
panels/network/network-ethernet.ui | 8 +-
panels/network/network-mobile.ui | 44 +++++-----
panels/network/network-proxy.ui | 52 ++++++------
panels/network/network-simple.ui | 6 +-
panels/network/network-vpn.ui | 6 +-
panels/network/network-wifi.ui | 32 +++----
panels/network/panel-common.c | 24 +++---
panels/network/panel-common.h | 8 +-
panels/network/wireless-security/eap-method-fast.c | 66 +++++++--------
.../network/wireless-security/eap-method-fast.ui | 36 ++++----
panels/network/wireless-security/eap-method-leap.c | 24 +++---
.../network/wireless-security/eap-method-leap.ui | 16 ++--
panels/network/wireless-security/eap-method-peap.c | 80 +++++++++---------
.../network/wireless-security/eap-method-peap.ui | 38 ++++-----
.../network/wireless-security/eap-method-simple.c | 24 +++---
.../network/wireless-security/eap-method-simple.ui | 16 ++--
panels/network/wireless-security/eap-method-tls.c | 98 +++++++++++-----------
panels/network/wireless-security/eap-method-tls.ui | 36 ++++----
panels/network/wireless-security/eap-method-ttls.c | 80 +++++++++---------
.../network/wireless-security/eap-method-ttls.ui | 34 ++++----
panels/network/wireless-security/ws-dynamic-wep.c | 18 ++--
panels/network/wireless-security/ws-dynamic-wep.ui | 14 ++--
panels/network/wireless-security/ws-leap.c | 26 +++---
panels/network/wireless-security/ws-leap.ui | 16 ++--
panels/network/wireless-security/ws-wep-key.c | 22 ++---
panels/network/wireless-security/ws-wep-key.ui | 18 ++--
panels/network/wireless-security/ws-wpa-eap.c | 18 ++--
panels/network/wireless-security/ws-wpa-eap.ui | 14 ++--
panels/network/wireless-security/ws-wpa-psk.c | 24 +++---
panels/network/wireless-security/ws-wpa-psk.ui | 16 ++--
52 files changed, 688 insertions(+), 688 deletions(-)
---
diff --git a/panels/network/connection-editor/8021x-security-page.ui
b/panels/network/connection-editor/8021x-security-page.ui
index 6ae7ce4bb..6da8ce3db 100644
--- a/panels/network/connection-editor/8021x-security-page.ui
+++ b/panels/network/connection-editor/8021x-security-page.ui
@@ -19,13 +19,13 @@
<property name="row_spacing">10</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_sec">
+ <object class="GtkLabel" id="security_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">802.1x _Security</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">8021x_switch</property>
+ <property name="mnemonic_widget">enable_8021x_switch</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -35,7 +35,7 @@
</packing>
</child>
<child>
- <object class="GtkSwitch" id="8021x_switch">
+ <object class="GtkSwitch" id="enable_8021x_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
@@ -49,7 +49,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c
b/panels/network/connection-editor/ce-page-8021x-security.c
index 072a7692a..33b2379e6 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.c
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
@@ -59,8 +59,8 @@ finish_setup (CEPage8021xSecurity *page, gpointer unused, GError *error, gpointe
if (error)
return;
- vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox"));
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_sec"));
+ vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "box"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_label"));
page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -102,7 +102,7 @@ ce_page_8021x_security_new (NMConnection *connection,
if (nm_connection_get_setting_802_1x (connection))
page->initial_have_8021x = TRUE;
- page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "8021x_switch"));
+ page->enabled = GTK_SWITCH (gtk_builder_get_object (CE_PAGE (page)->builder, "enable_8021x_switch"));
g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL);
@@ -137,7 +137,7 @@ validate (CEPage *cepage, NMConnection *connection, GError **error)
s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
nm_connection_add_setting (tmp_connection, nm_setting_duplicate (s_con));
- ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object
(page->security->builder, "wpa_eap_auth_combo")), tmp_connection);
+ ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object
(page->security->builder, "auth_combo")), tmp_connection);
s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
diff --git a/panels/network/connection-editor/ce-page-details.c
b/panels/network/connection-editor/ce-page-details.c
index a3c04632e..dc30807b0 100644
--- a/panels/network/connection-editor/ce-page-details.c
+++ b/panels/network/connection-editor/ce-page-details.c
@@ -110,8 +110,8 @@ update_last_used (CEPageDetails *page, NMConnection *connection)
else
last_used = g_strdup_printf (ngettext ("%i day ago", "%i days ago", days), days);
out:
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_last_used"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_last_used"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), last_used);
}
@@ -224,8 +224,8 @@ connect_details_page (CEPageDetails *page)
}
if (speed > 0)
speed_label = g_strdup_printf (_("%d Mb/s"), speed);
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_speed"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_speed"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "speed_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "speed_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), speed_label);
if (NM_IS_DEVICE_WIFI (page->device))
@@ -233,14 +233,14 @@ connect_details_page (CEPageDetails *page)
else if (NM_IS_DEVICE_ETHERNET (page->device))
hw_address = nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (page->device));
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_mac"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_mac"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hw_address);
if (device_is_active && active_ap)
security_string = get_ap_security_string (active_ap);
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_security"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_security"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "security_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), security_string);
strength = 0;
@@ -259,26 +259,26 @@ connect_details_page (CEPageDetails *page)
strength_label = C_("Signal strength", "Good");
else
strength_label = C_("Signal strength", "Excellent");
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_strength"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_strength"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "strength_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "strength_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), strength_label);
/* set IP entries */
- panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_ipv4")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_ipv4")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_ipv6")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_ipv6")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_dns")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "label_dns")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_route")),
- GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"label_route")),
+ panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"ipv4_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv4_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"ipv6_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "ipv6_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"dns_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder, "dns_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"route_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (CE_PAGE (page)->builder,
"route_label")),
device_is_active ? page->device : NULL);
if (!device_is_active && CE_PAGE (page)->connection)
update_last_used (page, CE_PAGE (page)->connection);
else {
- heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "heading_last_used"));
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_last_used"));
+ heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"last_used_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "last_used_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), NULL);
}
@@ -307,7 +307,7 @@ connect_details_page (CEPageDetails *page)
update_restrict_data (page);
/* Forget button */
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "button_forget"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "forget_button"));
g_signal_connect_swapped (widget, "clicked", G_CALLBACK (forget_cb), page);
if (g_str_equal (type, NM_SETTING_WIRELESS_SETTING_NAME))
diff --git a/panels/network/connection-editor/ce-page-ethernet.c
b/panels/network/connection-editor/ce-page-ethernet.c
index ccaa25d3e..45e01c3c3 100644
--- a/panels/network/connection-editor/ce-page-ethernet.c
+++ b/panels/network/connection-editor/ce-page-ethernet.c
@@ -186,11 +186,11 @@ ce_page_ethernet_new (NMConnection *connection,
"/org/gnome/control-center/network/ethernet-page.ui",
_("Identity")));
- page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_name"));
- page->device_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_mac"));
- page->cloned_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_cloned_mac"));
- page->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "spin_mtu"));
- page->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "label_mtu"));
+ page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "name_entry"));
+ page->device_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder,
"mac_combo"));
+ page->cloned_mac = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder,
"cloned_mac_combo"));
+ page->mtu = GTK_SPIN_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder, "mtu_spin"));
+ page->mtu_label = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "mtu_label"));
page->setting_connection = nm_connection_get_setting_connection (connection);
page->setting_wired = nm_connection_get_setting_wired (connection);
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 9cf694313..76726adb4 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -60,17 +60,17 @@ method_changed (CEPageIP4 *page)
gboolean routes_enabled;
GtkWidget *widget;
- if (RADIO_IS_ACTIVE ("radio_disabled")) {
+ if (RADIO_IS_ACTIVE ("disabled_radio")) {
addr_enabled = FALSE;
dns_enabled = FALSE;
routes_enabled = FALSE;
} else {
- addr_enabled = RADIO_IS_ACTIVE ("radio_manual");
- dns_enabled = !RADIO_IS_ACTIVE ("radio_local");
- routes_enabled = !RADIO_IS_ACTIVE ("radio_local");
+ addr_enabled = RADIO_IS_ACTIVE ("manual_radio");
+ dns_enabled = !RADIO_IS_ACTIVE ("local_radio");
+ routes_enabled = !RADIO_IS_ACTIVE ("local_radio");
}
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box"));
gtk_widget_set_visible (widget, addr_enabled);
gtk_widget_set_sensitive (page->dns_entry, dns_enabled);
gtk_widget_set_sensitive (page->routes_list, routes_enabled);
@@ -275,13 +275,13 @@ ensure_empty_address_row (CEPageIP4 *page)
}
static void
-add_address_section (CEPageIP4 *page)
+add_address_box (CEPageIP4 *page)
{
GtkWidget *widget;
GtkWidget *list;
gint i;
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box"));
page->address_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
@@ -446,13 +446,13 @@ ensure_empty_routes_row (CEPageIP4 *page)
}
static void
-add_routes_section (CEPageIP4 *page)
+add_routes_box (CEPageIP4 *page)
{
GtkWidget *widget;
GtkWidget *list;
gint i;
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_box"));
page->routes_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
@@ -506,17 +506,17 @@ connect_ip4_page (CEPageIP4 *page)
gboolean disabled;
guint method, i;
- add_address_section (page);
+ add_address_box (page);
add_dns_section (page);
- add_routes_section (page);
+ add_routes_box (page);
- page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_disabled"));
+ page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"disabled_radio"));
str_method = nm_setting_ip_config_get_method (page->setting);
disabled = g_strcmp0 (str_method, NM_SETTING_IP4_CONFIG_METHOD_DISABLED) == 0;
gtk_toggle_button_set_active (page->disabled, disabled);
g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page);
- content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content"));
+ content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "content_box"));
g_object_bind_property (page->disabled, "active",
content, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
@@ -538,9 +538,9 @@ connect_ip4_page (CEPageIP4 *page)
g_signal_connect_swapped (page->never_default, "toggled", G_CALLBACK (ce_page_changed), page);
/* Connect radio buttons */
- radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_automatic"));
- radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_local"));
- radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_manual"));
+ radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"automatic_radio"));
+ radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"local_radio"));
+ radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"manual_radio"));
radios[RADIO_DISABLED] = page->disabled;
for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++)
@@ -612,11 +612,11 @@ ui_to_setting (CEPageIP4 *page)
if (gtk_toggle_button_get_active (page->disabled)) {
method = NM_SETTING_IP4_CONFIG_METHOD_DISABLED;
} else {
- if (RADIO_IS_ACTIVE ("radio_automatic"))
+ if (RADIO_IS_ACTIVE ("automatic_radio"))
method = NM_SETTING_IP4_CONFIG_METHOD_AUTO;
- else if (RADIO_IS_ACTIVE ("radio_local"))
+ else if (RADIO_IS_ACTIVE ("local_radio"))
method = NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL;
- else if (RADIO_IS_ACTIVE ("radio_manual"))
+ else if (RADIO_IS_ACTIVE ("manual_radio"))
method = NM_SETTING_IP4_CONFIG_METHOD_MANUAL;
}
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index a76df6bdc..ab07166cb 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -61,17 +61,17 @@ method_changed (CEPageIP6 *page)
gboolean routes_enabled;
GtkWidget *widget;
- if (RADIO_IS_ACTIVE ("radio_disabled")) {
+ if (RADIO_IS_ACTIVE ("disabled_radio")) {
addr_enabled = FALSE;
dns_enabled = FALSE;
routes_enabled = FALSE;
} else {
- addr_enabled = RADIO_IS_ACTIVE ("radio_manual");
- dns_enabled = !RADIO_IS_ACTIVE ("radio_local");
- routes_enabled = !RADIO_IS_ACTIVE ("radio_local");
+ addr_enabled = RADIO_IS_ACTIVE ("manual_radio");
+ dns_enabled = !RADIO_IS_ACTIVE ("local_radio");
+ routes_enabled = !RADIO_IS_ACTIVE ("local_radio");
}
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box"));
gtk_widget_set_visible (widget, addr_enabled);
gtk_widget_set_sensitive (page->dns_entry, dns_enabled);
gtk_widget_set_sensitive (page->routes_list, routes_enabled);
@@ -253,13 +253,13 @@ ensure_empty_address_row (CEPageIP6 *page)
}
static void
-add_address_section (CEPageIP6 *page)
+add_address_box (CEPageIP6 *page)
{
GtkWidget *widget;
GtkWidget *list;
gint i;
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "address_box"));
page->address_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
@@ -420,13 +420,13 @@ add_empty_route_row (CEPageIP6 *page)
}
static void
-add_routes_section (CEPageIP6 *page)
+add_routes_box (CEPageIP6 *page)
{
GtkWidget *widget;
GtkWidget *list;
gint i;
- widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_section"));
+ widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "routes_box"));
page->routes_list = list = gtk_list_box_new ();
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
@@ -475,17 +475,17 @@ connect_ip6_page (CEPageIP6 *page)
gboolean disabled;
guint method, i;
- add_address_section (page);
+ add_address_box (page);
add_dns_section (page);
- add_routes_section (page);
+ add_routes_box (page);
- page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_disabled"));
+ page->disabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"disabled_radio"));
str_method = nm_setting_ip_config_get_method (page->setting);
disabled = g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) == 0;
gtk_toggle_button_set_active (page->disabled, disabled);
g_signal_connect_swapped (page->disabled, "notify::active", G_CALLBACK (ce_page_changed), page);
- content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "page_content"));
+ content = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "content_box"));
g_object_bind_property (page->disabled, "active",
content, "sensitive",
G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
@@ -510,10 +510,10 @@ connect_ip6_page (CEPageIP6 *page)
/* Connect radio buttons */
- radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_automatic"));
- radios[RADIO_DHCP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_dhcp"));
- radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_local"));
- radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"radio_manual"));
+ radios[RADIO_AUTOMATIC] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"automatic_radio"));
+ radios[RADIO_DHCP] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"dhcp_radio"));
+ radios[RADIO_LOCAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"local_radio"));
+ radios[RADIO_MANUAL] = GTK_TOGGLE_BUTTON (gtk_builder_get_object (CE_PAGE (page)->builder,
"manual_radio"));
radios[RADIO_DISABLED] = page->disabled;
for (i = RADIO_AUTOMATIC; i < RADIO_DISABLED; i++)
@@ -558,13 +558,13 @@ ui_to_setting (CEPageIP6 *page)
if (gtk_toggle_button_get_active (page->disabled)) {
method = NM_SETTING_IP6_CONFIG_METHOD_IGNORE;
} else {
- if (RADIO_IS_ACTIVE ("radio_manual")) {
+ if (RADIO_IS_ACTIVE ("manual_radio")) {
method = NM_SETTING_IP6_CONFIG_METHOD_MANUAL;
- } else if (RADIO_IS_ACTIVE ("radio_local")) {
+ } else if (RADIO_IS_ACTIVE ("local_radio")) {
method = NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
- } else if (RADIO_IS_ACTIVE ("radio_dhcp")) {
+ } else if (RADIO_IS_ACTIVE ("dhcp_radio")) {
method = NM_SETTING_IP6_CONFIG_METHOD_DHCP;
- } else if (RADIO_IS_ACTIVE ("radio_automatic")) {
+ } else if (RADIO_IS_ACTIVE ("automatic_radio")) {
method = NM_SETTING_IP6_CONFIG_METHOD_AUTO;
}
}
diff --git a/panels/network/connection-editor/ce-page-security.c
b/panels/network/connection-editor/ce-page-security.c
index 676f4f9ba..9e72f2184 100644
--- a/panels/network/connection-editor/ce-page-security.c
+++ b/panels/network/connection-editor/ce-page-security.c
@@ -132,7 +132,7 @@ security_combo_changed (CEPageSecurity *page)
wsec_size_group_clear (page->group);
- vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "vbox"));
+ vbox = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "box"));
children = gtk_container_get_children (GTK_CONTAINER (vbox));
for (l = children; l; l = l->next) {
gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (l->data));
@@ -221,8 +221,8 @@ finish_setup (CEPageSecurity *page)
page->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- page->security_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"heading_sec"));
- page->security_combo = combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_sec"));
+ page->security_heading = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
"security_label"));
+ page->security_combo = combo = GTK_COMBO_BOX (gtk_builder_get_object (CE_PAGE (page)->builder,
"security_combo"));
dev_caps = NM_WIFI_DEVICE_CAP_CIPHER_WEP40
| NM_WIFI_DEVICE_CAP_CIPHER_WEP104
diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c
index 36bed019c..f8f20c099 100644
--- a/panels/network/connection-editor/ce-page-vpn.c
+++ b/panels/network/connection-editor/ce-page-vpn.c
@@ -186,7 +186,7 @@ ce_page_vpn_new (NMConnection *connection,
"/org/gnome/control-center/network/vpn-page.ui",
_("Identity")));
- page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_name"));
+ page->name = GTK_ENTRY (gtk_builder_get_object (CE_PAGE (page)->builder, "name_entry"));
page->box = GTK_BOX (gtk_builder_get_object (CE_PAGE (page)->builder, "page"));
g_signal_connect (page, "initialized", G_CALLBACK (finish_setup), NULL);
diff --git a/panels/network/connection-editor/ce-page-wifi.c b/panels/network/connection-editor/ce-page-wifi.c
index b16364955..50ca048f9 100644
--- a/panels/network/connection-editor/ce-page-wifi.c
+++ b/panels/network/connection-editor/ce-page-wifi.c
@@ -48,7 +48,7 @@ connect_wifi_page (CEPageWifi *page)
gint i;
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
- "entry_ssid"));
+ "ssid_entry"));
ssid = nm_setting_wireless_get_ssid (page->setting);
if (ssid)
@@ -60,7 +60,7 @@ connect_wifi_page (CEPageWifi *page)
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
- "combo_bssid"));
+ "bssid_combo"));
bssid_array = g_ptr_array_new ();
for (i = 0; i < nm_setting_wireless_get_num_seen_bssids (page->setting); i++) {
@@ -74,7 +74,7 @@ connect_wifi_page (CEPageWifi *page)
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
- "combo_mac"));
+ "mac_combo"));
mac_list = ce_page_get_mac_list (CE_PAGE (page)->client, NM_TYPE_DEVICE_WIFI,
NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS);
s_mac_str = nm_setting_wireless_get_mac_address (page->setting);
@@ -84,7 +84,7 @@ connect_wifi_page (CEPageWifi *page)
widget = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder,
- "combo_cloned_mac"));
+ "cloned_mac_combo"));
cloned_mac = nm_setting_wireless_get_cloned_mac_address (page->setting);
ce_page_setup_cloned_mac_combo (GTK_COMBO_BOX_TEXT (widget), cloned_mac);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (ce_page_changed), page);
@@ -100,20 +100,20 @@ ui_to_setting (CEPageWifi *page)
g_autofree gchar *device_mac = NULL;
g_autofree gchar *cloned_mac = NULL;
- entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "entry_ssid"));
+ entry = GTK_WIDGET (gtk_builder_get_object (CE_PAGE (page)->builder, "ssid_entry"));
utf8_ssid = gtk_entry_get_text (GTK_ENTRY (entry));
if (!utf8_ssid || !*utf8_ssid)
ssid = NULL;
else {
ssid = g_bytes_new_static (utf8_ssid, strlen (utf8_ssid));
}
- entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder,
"combo_bssid")));
+ entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder,
"bssid_combo")));
bssid = gtk_entry_get_text (GTK_ENTRY (entry));
if (*bssid == '\0')
bssid = NULL;
- entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_mac")));
+ entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (CE_PAGE (page)->builder, "mac_combo")));
device_mac = ce_page_trim_address (gtk_entry_get_text (GTK_ENTRY (entry)));
- combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "combo_cloned_mac"));
+ combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (CE_PAGE (page)->builder, "cloned_mac_combo"));
cloned_mac = ce_page_cloned_mac_get (combo);
g_object_set (page->setting,
@@ -133,7 +133,7 @@ validate (CEPage *page,
GtkComboBoxText *combo;
gboolean ret = TRUE;
- entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_bssid")));
+ entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "bssid_combo")));
if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) {
widget_set_error (entry);
ret = FALSE;
@@ -141,7 +141,7 @@ validate (CEPage *page,
widget_unset_error (entry);
}
- entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "combo_mac")));
+ entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (page->builder, "mac_combo")));
if (!ce_page_address_is_valid (gtk_entry_get_text (GTK_ENTRY (entry)))) {
widget_set_error (entry);
ret = FALSE;
@@ -149,7 +149,7 @@ validate (CEPage *page,
widget_unset_error (entry);
}
- combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (page->builder, "combo_cloned_mac"));
+ combo = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (page->builder, "cloned_mac_combo"));
if (!ce_page_cloned_mac_combo_valid (combo)) {
widget_set_error (gtk_bin_get_child (GTK_BIN (combo)));
ret = FALSE;
diff --git a/panels/network/connection-editor/details-page.ui
b/panels/network/connection-editor/details-page.ui
index 44f1e7450..af7ffc76f 100644
--- a/panels/network/connection-editor/details-page.ui
+++ b/panels/network/connection-editor/details-page.ui
@@ -11,12 +11,12 @@
<property name="row_spacing">12</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="heading_strength">
+ <object class="GtkLabel" id="strength_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Signal Strength</property>
- <property name="mnemonic_widget">label_strength</property>
+ <property name="mnemonic_widget">strength_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -29,7 +29,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_strength">
+ <object class="GtkLabel" id="strength_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -45,12 +45,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_speed">
+ <object class="GtkLabel" id="speed_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Link speed</property>
- <property name="mnemonic_widget">label_speed</property>
+ <property name="mnemonic_widget">speed_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -63,7 +63,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_speed">
+ <object class="GtkLabel" id="speed_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -79,12 +79,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_security">
+ <object class="GtkLabel" id="security_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Security</property>
- <property name="mnemonic_widget">label_security</property>
+ <property name="mnemonic_widget">security_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -97,12 +97,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_ipv4">
+ <object class="GtkLabel" id="ipv4_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">IPv4 Address</property>
- <property name="mnemonic_widget">label_ipv4</property>
+ <property name="mnemonic_widget">ipv4_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -115,12 +115,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_ipv6">
+ <object class="GtkLabel" id="ipv6_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">IPv6 Address</property>
- <property name="mnemonic_widget">label_ipv6</property>
+ <property name="mnemonic_widget">ipv6_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -133,12 +133,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_mac">
+ <object class="GtkLabel" id="mac_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Hardware Address</property>
- <property name="mnemonic_widget">label_mac</property>
+ <property name="mnemonic_widget">mac_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -151,12 +151,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_route">
+ <object class="GtkLabel" id="route_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Default Route</property>
- <property name="mnemonic_widget">label_route</property>
+ <property name="mnemonic_widget">route_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -169,13 +169,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="dns_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">DNS</property>
- <property name="mnemonic_widget">label_dns</property>
+ <property name="mnemonic_widget">dns_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -188,12 +188,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_last_used">
+ <object class="GtkLabel" id="last_used_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Last Used</property>
- <property name="mnemonic_widget">label_last_used</property>
+ <property name="mnemonic_widget">last_used_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -206,7 +206,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_security">
+ <object class="GtkLabel" id="security_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -222,7 +222,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_ipv4">
+ <object class="GtkLabel" id="ipv4_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -238,7 +238,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_ipv6">
+ <object class="GtkLabel" id="ipv6_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -254,7 +254,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_mac">
+ <object class="GtkLabel" id="mac_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -270,7 +270,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_route">
+ <object class="GtkLabel" id="route_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -286,7 +286,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="dns_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -304,7 +304,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_last_used">
+ <object class="GtkLabel" id="last_used_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -408,7 +408,7 @@
</child>
<child>
- <object class="GtkButton" id="button_forget">
+ <object class="GtkButton" id="forget_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="use_underline">True</property>
diff --git a/panels/network/connection-editor/ethernet-page.ui
b/panels/network/connection-editor/ethernet-page.ui
index 1b707e8c2..57c7a3023 100644
--- a/panels/network/connection-editor/ethernet-page.ui
+++ b/panels/network/connection-editor/ethernet-page.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
+ <object class="GtkAdjustment" id="mtu_adjustment">
<property name="upper">10000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
@@ -24,7 +24,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Name</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_name</property>
+ <property name="mnemonic_widget">name_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -34,7 +34,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -53,7 +53,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_MAC Address</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_mac</property>
+ <property name="mnemonic_widget">mac_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -63,7 +63,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="combo_mac">
+ <object class="GtkComboBoxText" id="mac_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
@@ -78,7 +78,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="combo_cloned_mac">
+ <object class="GtkComboBoxText" id="cloned_mac_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
@@ -104,7 +104,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">M_TU</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">spin_mtu</property>
+ <property name="mnemonic_widget">mtu_spin</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -121,7 +121,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Cloned Address</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_cloned_mac</property>
+ <property name="mnemonic_widget">cloned_mac_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -131,7 +131,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_mtu">
+ <object class="GtkLabel" id="mtu_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">bytes</property>
@@ -144,12 +144,12 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="spin_mtu">
+ <object class="GtkSpinButton" id="mtu_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">mtu_adjustment</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index de9e94dfa..232a0072c 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -26,7 +26,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">IPv_4 Method</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">radio_disabled</property>
+ <property name="mnemonic_widget">disabled_radio</property>
<property name="xalign">0.0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -38,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_automatic">
+ <object class="GtkRadioButton" id="automatic_radio">
<property name="label" translatable="yes">Automatic (DHCP)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -51,13 +51,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_local">
+ <object class="GtkRadioButton" id="local_radio">
<property name="label" translatable="yes">Link-Local Only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">0</property>
@@ -65,13 +65,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_manual">
+ <object class="GtkRadioButton" id="manual_radio">
<property name="label" translatable="yes">Manual</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">1</property>
@@ -79,13 +79,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_disabled">
+ <object class="GtkRadioButton" id="disabled_radio">
<property name="label" translatable="yes">Disable</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">1</property>
@@ -93,13 +93,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="page_content">
+ <object class="GtkBox" id="content_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="address_section">
+ <object class="GtkBox" id="address_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -189,7 +189,7 @@
<property name="margin_top">24</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="dns_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -296,7 +296,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="routes_section">
+ <object class="GtkBox" id="routes_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index c9110a872..991f2f0c3 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -26,7 +26,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">IPv_6 Method</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">radio_disabled</property>
+ <property name="mnemonic_widget">disabled_radio</property>
<property name="xalign">0.0</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -38,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_automatic">
+ <object class="GtkRadioButton" id="automatic_radio">
<property name="label" translatable="yes">Automatic</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -51,13 +51,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_dhcp">
+ <object class="GtkRadioButton" id="dhcp_radio">
<property name="label" translatable="yes">Automatic, DHCP only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">0</property>
@@ -65,13 +65,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_local">
+ <object class="GtkRadioButton" id="local_radio">
<property name="label" translatable="yes">Link-Local Only</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">1</property>
@@ -79,13 +79,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_manual">
+ <object class="GtkRadioButton" id="manual_radio">
<property name="label" translatable="yes">Manual</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">1</property>
@@ -93,13 +93,13 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="radio_disabled">
+ <object class="GtkRadioButton" id="disabled_radio">
<property name="label" translatable="yes">Disable</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_automatic</property>
+ <property name="group">automatic_radio</property>
</object>
<packing>
<property name="top-attach">2</property>
@@ -107,13 +107,13 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="page_content">
+ <object class="GtkBox" id="content_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="address_section">
+ <object class="GtkBox" id="address_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -203,7 +203,7 @@
<property name="margin_top">24</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="dns_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -310,7 +310,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="routes_section">
+ <object class="GtkBox" id="routes_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/connection-editor/security-page.ui
b/panels/network/connection-editor/security-page.ui
index 4e274d0c7..8dedfa856 100644
--- a/panels/network/connection-editor/security-page.ui
+++ b/panels/network/connection-editor/security-page.ui
@@ -19,13 +19,13 @@
<property name="row_spacing">10</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_sec">
+ <object class="GtkLabel" id="security_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">S_ecurity</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_sec</property>
+ <property name="mnemonic_widget">security_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -35,7 +35,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combo_sec">
+ <object class="GtkComboBox" id="security_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -48,7 +48,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/connection-editor/vpn-page.ui b/panels/network/connection-editor/vpn-page.ui
index 676be5acd..5ed822cf8 100644
--- a/panels/network/connection-editor/vpn-page.ui
+++ b/panels/network/connection-editor/vpn-page.ui
@@ -22,7 +22,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Name</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_name</property>
+ <property name="mnemonic_widget">name_entry</property>
</object>
<packing>
<property name="expand">False</property>
@@ -31,7 +31,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
diff --git a/panels/network/connection-editor/wifi-page.ui b/panels/network/connection-editor/wifi-page.ui
index 4ed37bf10..0532f5c43 100644
--- a/panels/network/connection-editor/wifi-page.ui
+++ b/panels/network/connection-editor/wifi-page.ui
@@ -19,7 +19,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_SSID</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_ssid</property>
+ <property name="mnemonic_widget">ssid_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -35,7 +35,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_BSSID</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_bssid</property>
+ <property name="mnemonic_widget">bssid_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -45,7 +45,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_ssid">
+ <object class="GtkEntry" id="ssid_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -66,7 +66,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_MAC Address</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_mac</property>
+ <property name="mnemonic_widget">mac_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -76,7 +76,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="combo_cloned_mac">
+ <object class="GtkComboBoxText" id="cloned_mac_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
@@ -101,7 +101,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Cloned Address</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">combo_cloned_mac</property>
+ <property name="mnemonic_widget">cloned_mac_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -111,7 +111,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="combo_bssid">
+ <object class="GtkComboBoxText" id="bssid_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
@@ -126,7 +126,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="combo_mac">
+ <object class="GtkComboBoxText" id="mac_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c
index 5d471ae85..2e84e46ae 100644
--- a/panels/network/net-device-ethernet.c
+++ b/panels/network/net-device-ethernet.c
@@ -77,7 +77,7 @@ device_ethernet_add_to_stack (NetObject *object,
NetDeviceEthernet *device = NET_DEVICE_ETHERNET (object);
GtkWidget *vbox;
- vbox = GTK_WIDGET (gtk_builder_get_object (device->builder, "vbox6"));
+ vbox = GTK_WIDGET (gtk_builder_get_object (device->builder, "box"));
gtk_stack_add_named (stack, vbox, net_object_get_id (object));
return vbox;
}
@@ -209,7 +209,7 @@ device_ethernet_refresh_ui (NetDeviceEthernet *device)
nm_device = net_device_get_nm_device (NET_DEVICE (device));
- widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "label_device"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "device_label"));
gtk_label_set_label (GTK_LABEL (widget), net_object_get_title (NET_OBJECT (device)));
widget = GTK_WIDGET (gtk_builder_get_object (device->builder, "device_off_switch"));
@@ -521,7 +521,7 @@ device_ethernet_constructed (GObject *object)
g_signal_connect_swapped (widget, "notify::active",
G_CALLBACK (device_off_toggled), device);
- device->scrolled_window = swin = GTK_WIDGET (gtk_builder_get_object (device->builder, "list"));
+ device->scrolled_window = swin = GTK_WIDGET (gtk_builder_get_object (device->builder,
"scrolled_window"));
device->list = list = GTK_WIDGET (gtk_list_box_new ());
gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
gtk_list_box_set_header_func (GTK_LIST_BOX (list), cc_list_box_update_header_func, NULL, NULL);
@@ -530,7 +530,7 @@ device_ethernet_constructed (GObject *object)
G_CALLBACK (connection_activated), device);
gtk_widget_show (list);
- device->details = GTK_WIDGET (gtk_builder_get_object (device->builder, "details"));
+ device->details = GTK_WIDGET (gtk_builder_get_object (device->builder, "details_frame"));
device->details_button = GTK_WIDGET (gtk_builder_get_object (device->builder, "details_button"));
g_signal_connect_swapped (device->details_button, "clicked",
diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
index 48dfa86d3..7c00d0c78 100644
--- a/panels/network/net-device-mobile.c
+++ b/panels/network/net-device-mobile.c
@@ -76,14 +76,14 @@ device_mobile_proxy_add_to_stack (NetObject *object,
/* add widgets to size group */
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder,
- "heading_imei"));
+ "imei_heading_label"));
gtk_size_group_add_widget (heading_size_group, widget);
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder,
- "heading_network"));
+ "network_label"));
gtk_size_group_add_widget (heading_size_group, widget);
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder,
- "vbox7"));
+ "box"));
gtk_stack_add_named (stack, widget, net_object_get_id (object));
return widget;
}
@@ -259,8 +259,8 @@ device_mobile_refresh_equipment_id (NetDeviceMobile *device_mobile)
"ControlCenter::EquipmentIdentifier");
}
- heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "heading_imei"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_imei"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "imei_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "imei_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), equipment_id);
}
@@ -308,8 +308,8 @@ device_mobile_refresh_operator_name (NetDeviceMobile *device_mobile)
{
GtkWidget *heading, *widget;
- heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "heading_provider"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_provider"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "provider_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "provider_label"));
if (device_mobile->mm_object != NULL) {
g_autofree gchar *operator_name = NULL;
@@ -384,7 +384,7 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile)
nm_device = net_device_get_nm_device (NET_DEVICE (device_mobile));
/* set device kind */
- widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_device"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "device_label"));
g_object_bind_property (device_mobile, "title", widget, "label", 0);
/* set up the device on/off switch */
@@ -393,13 +393,13 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile)
mobilebb_enabled_toggled (device_mobile);
/* set device state, with status */
- widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "label_status"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "status_label"));
status = panel_device_status_to_localized_string (nm_device, NULL);
gtk_label_set_label (GTK_LABEL (widget), status);
/* sensitive for other connection types if the device is currently connected */
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder,
- "button_options"));
+ "options_button"));
is_connected = net_device_get_find_connection (NET_DEVICE (device_mobile)) != NULL;
gtk_widget_set_sensitive (widget, is_connected);
@@ -413,22 +413,22 @@ nm_device_mobile_refresh_ui (NetDeviceMobile *device_mobile)
/* add possible connections to device */
liststore = GTK_LIST_STORE (gtk_builder_get_object (device_mobile->builder,
- "liststore_mobile_connections"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "combobox_network"));
+ "mobile_connections_list_store"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder, "network_combo"));
device_add_device_connections (device_mobile,
nm_device,
liststore,
GTK_COMBO_BOX (widget));
/* set IP entries */
- panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"heading_ipv4")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_ipv4")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"heading_ipv6")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_ipv6")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "heading_dns")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_dns")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"heading_route")),
- GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "label_route")),
+ panel_set_device_widgets (GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"ipv4_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv4_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"ipv6_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "ipv6_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"dns_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "dns_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder,
"route_heading_label")),
+ GTK_LABEL (gtk_builder_get_object (device_mobile->builder, "route_label")),
nm_device);
}
@@ -890,7 +890,7 @@ net_device_mobile_init (NetDeviceMobile *device_mobile)
/* setup mobile combobox model */
combobox = GTK_COMBO_BOX (gtk_builder_get_object (device_mobile->builder,
- "combobox_network"));
+ "network_combo"));
g_signal_connect_swapped (combobox, "changed",
G_CALLBACK (mobile_connection_changed_cb),
device_mobile);
@@ -908,7 +908,7 @@ net_device_mobile_init (NetDeviceMobile *device_mobile)
G_CALLBACK (device_off_toggled), device_mobile);
widget = GTK_WIDGET (gtk_builder_get_object (device_mobile->builder,
- "button_options"));
+ "options_button"));
g_signal_connect_swapped (widget, "clicked",
G_CALLBACK (edit_connection), device_mobile);
}
diff --git a/panels/network/net-device-simple.c b/panels/network/net-device-simple.c
index fce761c9a..18749647c 100644
--- a/panels/network/net-device-simple.c
+++ b/panels/network/net-device-simple.c
@@ -62,7 +62,7 @@ device_simple_proxy_add_to_stack (NetObject *object,
/* add widgets to size group */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "vbox6"));
+ "box"));
gtk_stack_add_named (stack, widget, net_object_get_id (object));
return widget;
}
@@ -101,7 +101,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple)
nm_device = net_device_get_nm_device (NET_DEVICE (device_simple));
/* set device kind */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_device"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "device_label"));
g_object_bind_property (device_simple, "title", widget, "label", 0);
/* set up the device on/off switch */
@@ -113,7 +113,7 @@ nm_device_simple_refresh_ui (NetDeviceSimple *device_simple)
update_off_switch_from_device_state (GTK_SWITCH (widget), state, device_simple);
/* set up the Options button */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_options"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "options_button"));
gtk_widget_set_visible (widget, state != NM_DEVICE_STATE_UNMANAGED);
}
@@ -237,7 +237,7 @@ net_device_simple_init (NetDeviceSimple *device_simple)
G_CALLBACK (device_off_toggled), device_simple);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
- "button_options"));
+ "options_button"));
g_signal_connect_swapped (widget, "clicked",
G_CALLBACK (edit_connection), device_simple);
}
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index f009bd24f..ce1126725 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -106,7 +106,7 @@ device_wifi_proxy_add_to_stack (NetObject *object,
nmdevice = net_device_get_nm_device (NET_DEVICE (object));
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
- "notebook_view"));
+ "notebook"));
gtk_stack_add_titled (stack, widget,
net_object_get_id (object),
nm_device_get_description (nmdevice));
@@ -319,17 +319,17 @@ nm_device_wifi_refresh_hotspot (NetDeviceWifi *device_wifi)
g_debug ("Refreshing hotspot labels to name: '%s', security key: '%s', security: '%s'",
hotspot_ssid, hotspot_secret, hotspot_security);
- heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_network_name"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_network_name"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
"hotspot_network_name_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_network_name_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_ssid);
- heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_security_key"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_security_key"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
"hotspot_security_key_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_key_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_secret);
- heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_security"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_security"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
"hotspot_security_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_security_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), hotspot_security);
- heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_hotspot_connected"));
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "label_hotspot_connected"));
+ heading = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
"hotspot_connected_heading_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "hotspot_connected_label"));
panel_set_device_widget_details (GTK_LABEL (heading), GTK_LABEL (widget), NULL);
}
@@ -422,7 +422,7 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
/* keep this in sync with the signal handler setup in cc_network_panel_init */
wireless_enabled_toggled (device_wifi);
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_status"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "status_label"));
status = panel_device_status_to_localized_string (nm_device, NULL);
gtk_label_set_label (GTK_LABEL (widget), status);
@@ -671,7 +671,7 @@ show_hotspot_ui (NetDeviceWifi *device_wifi)
GtkWidget *widget;
/* show hotspot tab */
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook_view"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook"));
gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1);
/* force switch to on as this succeeded */
@@ -910,7 +910,7 @@ static void
show_wifi_list (NetDeviceWifi *device_wifi)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook_view"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "notebook"));
gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0);
}
@@ -963,7 +963,7 @@ net_device_wifi_constructed (GObject *object)
} else
gtk_widget_set_sensitive (widget, TRUE);
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "heading_list"));
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder, "title_label"));
g_object_bind_property (device_wifi, "title", widget, "label", 0);
nm_device_wifi_refresh_ui (device_wifi);
@@ -1425,7 +1425,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi)
/* setup view */
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
- "notebook_view"));
+ "notebook"));
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 0);
@@ -1445,7 +1445,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi)
G_CALLBACK (open_history), device_wifi);
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->builder,
- "switch_hotspot_off"));
+ "hotspot_off_switch"));
device_wifi->hotspot_switch = GTK_SWITCH (widget);
g_signal_connect_swapped (widget, "notify::active",
G_CALLBACK (switch_hotspot_changed_cb), device_wifi);
diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c
index 5796d1afc..362789399 100644
--- a/panels/network/net-proxy.c
+++ b/panels/network/net-proxy.c
@@ -111,7 +111,7 @@ check_wpad_warning (NetProxy *proxy)
g_string_append (string, "</small>");
out:
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "label_proxy_warning"));
+ "proxy_warning_label"));
gtk_label_set_markup (GTK_LABEL (widget), string->str);
gtk_widget_set_visible (widget, (string->len > 0));
@@ -312,7 +312,7 @@ net_proxy_init (NetProxy *proxy)
/* bind the proxy values */
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_url"));
+ "proxy_url_entry"));
g_settings_bind (proxy->settings, "autoconfig-url",
widget, "text",
G_SETTINGS_BIND_DEFAULT);
@@ -320,12 +320,12 @@ net_proxy_init (NetProxy *proxy)
/* bind the HTTP proxy values */
http_settings = g_settings_get_child (proxy->settings, "http");
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_http"));
+ "proxy_http_entry"));
g_settings_bind (http_settings, "host",
widget, "text",
G_SETTINGS_BIND_DEFAULT);
adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder,
- "adjustment_proxy_port_http"));
+ "proxy_port_http_adjustment"));
g_settings_bind (http_settings, "port",
adjustment, "value",
G_SETTINGS_BIND_DEFAULT);
@@ -333,12 +333,12 @@ net_proxy_init (NetProxy *proxy)
/* bind the HTTPS proxy values */
https_settings = g_settings_get_child (proxy->settings, "https");
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_https"));
+ "proxy_https_entry"));
g_settings_bind (https_settings, "host",
widget, "text",
G_SETTINGS_BIND_DEFAULT);
adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder,
- "adjustment_proxy_port_https"));
+ "proxy_port_https_adjustment"));
g_settings_bind (https_settings, "port",
adjustment, "value",
G_SETTINGS_BIND_DEFAULT);
@@ -346,12 +346,12 @@ net_proxy_init (NetProxy *proxy)
/* bind the FTP proxy values */
ftp_settings = g_settings_get_child (proxy->settings, "ftp");
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_ftp"));
+ "proxy_ftp_entry"));
g_settings_bind (ftp_settings, "host",
widget, "text",
G_SETTINGS_BIND_DEFAULT);
adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder,
- "adjustment_proxy_port_ftp"));
+ "proxy_port_ftp_adjustment"));
g_settings_bind (ftp_settings, "port",
adjustment, "value",
G_SETTINGS_BIND_DEFAULT);
@@ -359,19 +359,19 @@ net_proxy_init (NetProxy *proxy)
/* bind the SOCKS proxy values */
socks_settings = g_settings_get_child (proxy->settings, "socks");
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_socks"));
+ "proxy_socks_entry"));
g_settings_bind (socks_settings, "host",
widget, "text",
G_SETTINGS_BIND_DEFAULT);
adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (proxy->builder,
- "adjustment_proxy_port_socks"));
+ "proxy_port_socks_adjustment"));
g_settings_bind (socks_settings, "port",
adjustment, "value",
G_SETTINGS_BIND_DEFAULT);
/* bind the proxy ignore hosts */
widget = GTK_WIDGET (gtk_builder_get_object (proxy->builder,
- "entry_proxy_ignore"));
+ "proxy_ignore_entry"));
g_settings_bind_with_mapping (proxy->settings, "ignore-hosts",
widget, "text",
G_SETTINGS_BIND_DEFAULT, get_ignore_hosts, set_ignore_hosts,
@@ -379,11 +379,11 @@ net_proxy_init (NetProxy *proxy)
/* radio buttons */
proxy->mode_radios[MODE_DISABLED] =
- GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_none"));
+ GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "none_radio"));
proxy->mode_radios[MODE_MANUAL] =
- GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_manual"));
+ GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "manual_radio"));
proxy->mode_radios[MODE_AUTOMATIC] =
- GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "radio_automatic"));
+ GTK_RADIO_BUTTON (gtk_builder_get_object (proxy->builder, "automatic_radio"));
/* setup the radio before connecting to the :toggled signal */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (proxy->mode_radios[value]), TRUE);
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index 199633be0..0b8e0c31d 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -137,7 +137,7 @@ vpn_proxy_add_to_stack (NetObject *object,
/* add widgets to size group */
widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder,
- "vbox9"));
+ "box"));
gtk_stack_add_named (stack, widget, net_object_get_id (object));
return widget;
}
@@ -156,7 +156,7 @@ nm_device_refresh_vpn_ui (NetVpn *vpn)
/* update title */
widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder,
- "label_device"));
+ "device_label"));
/* Translators: this is the title of the connection details
* window for vpn connections, it is also used to display
* vpn connections in the device list.
@@ -276,7 +276,7 @@ vpn_proxy_edit (NetObject *object)
g_autofree gchar *title = NULL;
button = GTK_WIDGET (gtk_builder_get_object (vpn->builder,
- "button_options"));
+ "options_button"));
window = gtk_widget_get_toplevel (button);
client = net_object_get_client (object);
@@ -420,7 +420,7 @@ net_vpn_init (NetVpn *vpn)
G_CALLBACK (device_off_toggled), vpn);
widget = GTK_WIDGET (gtk_builder_get_object (vpn->builder,
- "button_options"));
+ "options_button"));
g_signal_connect_swapped (widget, "clicked",
G_CALLBACK (edit_connection), vpn);
}
diff --git a/panels/network/network-ethernet.ui b/panels/network/network-ethernet.ui
index 6f9c8af3a..690484c31 100644
--- a/panels/network/network-ethernet.ui
+++ b/panels/network/network-ethernet.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="vbox6">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -11,7 +11,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel" id="label_device">
+ <object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -48,7 +48,7 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="list">
+ <object class="GtkScrolledWindow" id="scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -60,7 +60,7 @@
<!-- Single profile row -->
<child>
- <object class="GtkFrame" id="details">
+ <object class="GtkFrame" id="details_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="expand">True</property>
diff --git a/panels/network/network-mobile.ui b/panels/network/network-mobile.ui
index c8f7fae4c..3e9602242 100644
--- a/panels/network/network-mobile.ui
+++ b/panels/network/network-mobile.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkListStore" id="liststore_mobile_connections">
+ <object class="GtkListStore" id="mobile_connections_list_store">
<columns>
<!-- column-name id -->
<column type="gchararray"/>
@@ -9,7 +9,7 @@
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkBox" id="vbox7">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -23,12 +23,12 @@
<property name="row_spacing">10</property>
<property name="column_spacing">6</property>
<child>
- <object class="GtkLabel" id="heading_imei">
+ <object class="GtkLabel" id="imei_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">IMEI</property>
- <property name="mnemonic_widget">label_imei</property>
+ <property name="mnemonic_widget">imei_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -41,12 +41,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_provider">
+ <object class="GtkLabel" id="provider_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Provider</property>
- <property name="mnemonic_widget">label_provider</property>
+ <property name="mnemonic_widget">provider_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -59,7 +59,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_imei">
+ <object class="GtkLabel" id="imei_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -74,7 +74,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_provider">
+ <object class="GtkLabel" id="provider_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -89,7 +89,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_ipv4">
+ <object class="GtkLabel" id="ipv4_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -104,7 +104,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_ipv6">
+ <object class="GtkLabel" id="ipv6_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -118,7 +118,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_route">
+ <object class="GtkLabel" id="route_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -132,7 +132,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_dns">
+ <object class="GtkLabel" id="dns_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -165,7 +165,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_ipv4">
+ <object class="GtkLabel" id="ipv4_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -182,7 +182,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_ipv6">
+ <object class="GtkLabel" id="ipv6_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -199,7 +199,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_route">
+ <object class="GtkLabel" id="route_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -216,7 +216,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_dns">
+ <object class="GtkLabel" id="dns_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -234,7 +234,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_network">
+ <object class="GtkLabel" id="network_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -251,10 +251,10 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="combobox_network">
+ <object class="GtkComboBox" id="network_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore_mobile_connections</property>
+ <property name="model">mobile_connections_list_store</property>
<property name="entry_text_column">1</property>
</object>
<packing>
@@ -295,7 +295,7 @@
<property name="spacing">3</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="label_device">
+ <object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -313,7 +313,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_status">
+ <object class="GtkLabel" id="status_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -373,7 +373,7 @@
<property name="yscale">0</property>
<property name="top_padding">12</property>
<child>
- <object class="GtkButton" id="button_options">
+ <object class="GtkButton" id="options_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui
index dd139b91d..b3a764488 100644
--- a/panels/network/network-proxy.ui
+++ b/panels/network/network-proxy.ui
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment_proxy_port_ftp">
+ <object class="GtkAdjustment" id="proxy_port_ftp_adjustment">
<property name="upper">65535</property>
<property name="step_increment">1</property>
</object>
- <object class="GtkAdjustment" id="adjustment_proxy_port_http">
+ <object class="GtkAdjustment" id="proxy_port_http_adjustment">
<property name="upper">65535</property>
<property name="step_increment">1</property>
</object>
- <object class="GtkAdjustment" id="adjustment_proxy_port_https">
+ <object class="GtkAdjustment" id="proxy_port_https_adjustment">
<property name="upper">65535</property>
<property name="step_increment">1</property>
</object>
- <object class="GtkAdjustment" id="adjustment_proxy_port_socks">
+ <object class="GtkAdjustment" id="proxy_port_socks_adjustment">
<property name="upper">65535</property>
<property name="step_increment">1</property>
</object>
@@ -100,27 +100,27 @@
<property name="border_width">0</property>
<property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="radio_automatic">
+ <object class="GtkRadioButton" id="automatic_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Automatic</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_none</property>
+ <property name="group">none_radio</property>
</object>
</child>
<child>
- <object class="GtkRadioButton" id="radio_manual">
+ <object class="GtkRadioButton" id="manual_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Manual</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- <property name="group">radio_none</property>
+ <property name="group">none_radio</property>
</object>
</child>
<child>
- <object class="GtkRadioButton" id="radio_none">
+ <object class="GtkRadioButton" id="none_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Disabled</property>
@@ -175,7 +175,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_HTTP Proxy</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_http</property>
+ <property name="mnemonic_widget">proxy_http_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -194,7 +194,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">H_TTPS Proxy</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_https</property>
+ <property name="mnemonic_widget">proxy_https_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -213,7 +213,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_FTP Proxy</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_ftp</property>
+ <property name="mnemonic_widget">proxy_ftp_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -232,7 +232,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Socks Host</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_socks</property>
+ <property name="mnemonic_widget">proxy_socks_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -251,7 +251,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Ignore Hosts</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_ignore</property>
+ <property name="mnemonic_widget">proxy_ignore_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -264,7 +264,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_http">
+ <object class="GtkEntry" id="proxy_http_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -284,7 +284,7 @@
<property name="invisible_char">●</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment_proxy_port_http</property>
+ <property name="adjustment">proxy_port_http_adjustment</property>
<child internal-child="accessible">
<object class="AtkObject">
<property name="accessible-name" translatable="yes">HTTP proxy port</property>
@@ -299,7 +299,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_https">
+ <object class="GtkEntry" id="proxy_https_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -313,7 +313,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_ftp">
+ <object class="GtkEntry" id="proxy_ftp_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -327,7 +327,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_socks">
+ <object class="GtkEntry" id="proxy_socks_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -341,7 +341,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_ignore">
+ <object class="GtkEntry" id="proxy_ignore_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -361,7 +361,7 @@
<property name="invisible_char">●</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment_proxy_port_https</property>
+ <property name="adjustment">proxy_port_https_adjustment</property>
<child internal-child="accessible">
<object class="AtkObject">
<property name="accessible-name" translatable="yes">HTTPS proxy port</property>
@@ -382,7 +382,7 @@
<property name="invisible_char">●</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment_proxy_port_ftp</property>
+ <property name="adjustment">proxy_port_ftp_adjustment</property>
<child internal-child="accessible">
<object class="AtkObject">
<property name="accessible-name" translatable="yes">FTP proxy port</property>
@@ -403,7 +403,7 @@
<property name="invisible_char">●</property>
<property name="xalign">1</property>
<property name="invisible_char_set">True</property>
- <property name="adjustment">adjustment_proxy_port_socks</property>
+ <property name="adjustment">proxy_port_socks_adjustment</property>
<child internal-child="accessible">
<object class="AtkObject">
<property name="accessible-name" translatable="yes">Socks proxy port</property>
@@ -437,7 +437,7 @@
<property name="xalign">1</property>
<property name="label" translatable="yes">_Configuration URL</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_proxy_url</property>
+ <property name="mnemonic_widget">proxy_url_entry</property>
<style>
<class name="dim-label"/>
</style>
@@ -448,7 +448,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="entry_proxy_url">
+ <object class="GtkEntry" id="proxy_url_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@@ -460,7 +460,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_proxy_warning">
+ <object class="GtkLabel" id="proxy_warning_label">
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
diff --git a/panels/network/network-simple.ui b/panels/network/network-simple.ui
index a6172c7ce..dec1c7038 100644
--- a/panels/network/network-simple.ui
+++ b/panels/network/network-simple.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="vbox6">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -31,7 +31,7 @@
<property name="margin_end">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label_device">
+ <object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -53,7 +53,7 @@
</object>
</child>
<child>
- <object class="GtkButton" id="button_options">
+ <object class="GtkButton" id="options_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui
index b4150ff5c..35f85c78f 100644
--- a/panels/network/network-vpn.ui
+++ b/panels/network/network-vpn.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="vbox9">
+ <object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -37,7 +37,7 @@
<property name="margin_end">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label_device">
+ <object class="GtkLabel" id="device_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -59,7 +59,7 @@
</object>
</child>
<child>
- <object class="GtkButton" id="button_options">
+ <object class="GtkButton" id="options_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui
index 00bb1d8b1..4322f3e18 100644
--- a/panels/network/network-wifi.ui
+++ b/panels/network/network-wifi.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkNotebook" id="notebook_view">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -72,7 +72,7 @@
</packing>
</child>
<child>
- <object class="GtkSwitch" id="switch_hotspot_off">
+ <object class="GtkSwitch" id="hotspot_off_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
@@ -101,12 +101,12 @@
<property name="column_spacing">6</property>
<property name="column-homogeneous">True</property>
<child>
- <object class="GtkLabel" id="heading_hotspot_network_name">
+ <object class="GtkLabel" id="hotspot_network_name_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Network Name</property>
- <property name="mnemonic_widget">label_hotspot_network_name</property>
+ <property name="mnemonic_widget">hotspot_network_name_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -119,12 +119,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_hotspot_connected">
+ <object class="GtkLabel" id="hotspot_connected_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Connected Devices</property>
- <property name="mnemonic_widget">label_hotspot_connected</property>
+ <property name="mnemonic_widget">hotspot_connected_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -137,12 +137,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_hotspot_security">
+ <object class="GtkLabel" id="hotspot_security_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Security type</property>
- <property name="mnemonic_widget">label_hotspot_security</property>
+ <property name="mnemonic_widget">hotspot_security_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -155,7 +155,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_hotspot_network_name">
+ <object class="GtkLabel" id="hotspot_network_name_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -170,7 +170,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_hotspot_connected">
+ <object class="GtkLabel" id="hotspot_connected_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -185,7 +185,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_hotspot_security">
+ <object class="GtkLabel" id="hotspot_security_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -200,12 +200,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="heading_hotspot_security_key">
+ <object class="GtkLabel" id="hotspot_security_key_heading_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" context="Wi-Fi passkey" translatable="yes">Password</property>
- <property name="mnemonic_widget">label_hotspot_security_key</property>
+ <property name="mnemonic_widget">hotspot_security_key_label</property>
<style>
<class name="dim-label"/>
</style>
@@ -218,7 +218,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_hotspot_security_key">
+ <object class="GtkLabel" id="hotspot_security_key_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -257,7 +257,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<child>
- <object class="GtkLabel" id="heading_list">
+ <object class="GtkLabel" id="title_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Wi-Fi</property>
@@ -267,7 +267,7 @@
</object>
</child>
<child>
- <object class="GtkLabel" id="heading_status">
+ <object class="GtkLabel" id="status_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<style>
diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
index 435866b51..9b15d11ba 100644
--- a/panels/network/panel-common.c
+++ b/panels/network/panel-common.c
@@ -375,10 +375,10 @@ panel_get_ip6_address_as_string (NMIPConfig *ip6_config)
}
void
-panel_set_device_widgets (GtkLabel *heading_ipv4, GtkLabel *label_ipv4,
- GtkLabel *heading_ipv6, GtkLabel *label_ipv6,
- GtkLabel *heading_dns, GtkLabel *label_dns,
- GtkLabel *heading_route, GtkLabel *label_route,
+panel_set_device_widgets (GtkLabel *ipv4_heading_label, GtkLabel *ipv4_label,
+ GtkLabel *ipv6_heading_label, GtkLabel *ipv6_label,
+ GtkLabel *heading_dns, GtkLabel *dns_label,
+ GtkLabel *route_heading_label, GtkLabel *route_label,
NMDevice *device)
{
g_autofree gchar *ipv4_text = NULL;
@@ -401,19 +401,19 @@ panel_set_device_widgets (GtkLabel *heading_ipv4, GtkLabel *label_ipv4,
ipv6_text = panel_get_ip6_address_as_string (ip6_config);
}
- panel_set_device_widget_details (heading_ipv4, label_ipv4, ipv4_text);
- panel_set_device_widget_details (heading_ipv6, label_ipv6, ipv6_text);
- panel_set_device_widget_details (heading_dns, label_dns, dns_text);
- panel_set_device_widget_details (heading_route, label_route, route_text);
+ panel_set_device_widget_details (ipv4_heading_label, ipv4_label, ipv4_text);
+ panel_set_device_widget_details (ipv6_heading_label, ipv6_label, ipv6_text);
+ panel_set_device_widget_details (heading_dns, dns_label, dns_text);
+ panel_set_device_widget_details (route_heading_label, route_label, route_text);
has_ip4 = ipv4_text != NULL;
has_ip6 = ipv6_text != NULL;
if (has_ip4 && has_ip6) {
- gtk_label_set_label (heading_ipv4, _("IPv4 Address"));
- gtk_label_set_label (heading_ipv6, _("IPv6 Address"));
+ gtk_label_set_label (ipv4_heading_label, _("IPv4 Address"));
+ gtk_label_set_label (ipv6_heading_label, _("IPv6 Address"));
} else if (has_ip4) {
- gtk_label_set_label (heading_ipv4, _("IP Address"));
+ gtk_label_set_label (ipv4_heading_label, _("IP Address"));
} else if (has_ip6) {
- gtk_label_set_label (heading_ipv6, _("IP Address"));
+ gtk_label_set_label (ipv6_heading_label, _("IP Address"));
}
}
diff --git a/panels/network/panel-common.h b/panels/network/panel-common.h
index 660d89f49..9d3581e8f 100644
--- a/panels/network/panel-common.h
+++ b/panels/network/panel-common.h
@@ -31,10 +31,10 @@ gchar *panel_device_status_to_localized_string (NMDevice *nm_dev
gboolean panel_set_device_widget_details (GtkLabel *heading,
GtkLabel *widget,
const gchar *value);
-void panel_set_device_widgets (GtkLabel *heading_ipv4, GtkLabel *label_ipv4,
- GtkLabel *heading_ipv6, GtkLabel *label_ipv6,
- GtkLabel *heading_dns, GtkLabel *label_dns,
- GtkLabel *heading_route, GtkLabel
*label_route,
+void panel_set_device_widgets (GtkLabel *ipv4_heading_label, GtkLabel
*ipv4_label,
+ GtkLabel *ipv6_heading_label, GtkLabel
*ipv6_label,
+ GtkLabel *heading_dns, GtkLabel *dns_label,
+ GtkLabel *route_heading_label, GtkLabel
*route_label,
NMDevice *device);
gchar *panel_get_ip4_address_as_string (NMIPConfig *config, const gchar *what);
gchar *panel_get_ip4_dns_as_string (NMIPConfig *config);
diff --git a/panels/network/wireless-security/eap-method-fast.c
b/panels/network/wireless-security/eap-method-fast.c
index 232d7c4e8..84ccfc0e9 100644
--- a/panels/network/wireless-security/eap-method-fast.c
+++ b/panels/network/wireless-security/eap-method-fast.c
@@ -61,10 +61,10 @@ validate (EAPMethod *parent, GError **error)
gboolean provisioning;
gboolean valid = TRUE;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
g_assert (widget);
provisioning = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_button"));
g_assert (widget);
file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
if (!provisioning && !file) {
@@ -74,7 +74,7 @@ validate (EAPMethod *parent, GError **error)
} else
widget_unset_error (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter);
@@ -97,23 +97,23 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
g_object_unref (method->size_group);
method->size_group = g_object_ref (group);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
@@ -141,24 +141,24 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
nm_setting_802_1x_add_eap_method (s_8021x, "fast");
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
g_assert (widget);
text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
g_object_set (s_8021x, NM_SETTING_802_1X_PAC_FILE, filename, NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
if (!enabled)
g_object_set (G_OBJECT (s_8021x), NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, "0", NULL);
else {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_pac_provision_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_combo"));
pac_provisioning = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
switch (pac_provisioning) {
@@ -177,7 +177,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
}
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter);
gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1);
@@ -197,8 +197,8 @@ inner_auth_combo_changed_cb (EAPMethodFAST *self)
GtkTreeIter iter;
GtkWidget *eap_widget;
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
- vbox = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_vbox"));
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
+ vbox = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_box"));
g_assert (vbox);
/* Remove any previous wireless security widgets */
@@ -282,7 +282,7 @@ inner_auth_combo_init (EAPMethodFAST *method,
if (phase2_auth && !strcasecmp (phase2_auth, "mschapv2"))
active = 1;
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (combo);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (auth_model));
@@ -297,7 +297,7 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
{
eap_method_phase2_update_secrets_helper (parent,
connection,
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"eap_fast_inner_auth_combo")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"inner_auth_combo")),
I_METHOD_COLUMN);
}
@@ -309,10 +309,10 @@ pac_toggled_cb (EAPMethodFAST *self)
gboolean enabled = FALSE;
GtkWidget *provision_combo;
- provision_combo = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_pac_provision_combo"));
+ provision_combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_combo"));
g_return_if_fail (provision_combo);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
gtk_widget_set_sensitive (provision_combo, enabled);
@@ -347,8 +347,8 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
update_secrets,
destroy,
"/org/gnome/ControlCenter/network/eap-method-fast.ui",
- "eap_fast_grid",
- "eap_fast_anon_identity_entry",
+ "grid",
+ "anon_identity_entry",
FALSE);
if (!parent)
return NULL;
@@ -362,7 +362,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
s_8021x = nm_connection_get_setting_802_1x (connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_combo"));
g_assert (widget);
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
if (s_8021x) {
@@ -383,16 +383,16 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
gtk_widget_set_sensitive (widget, provisioning_enabled);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), provisioning_enabled);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (pac_toggled_cb), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_button"));
g_assert (widget);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
@@ -418,21 +418,21 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
inner_auth_combo_changed_cb (method);
if (secrets_only) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_pac_provision_checkbutton"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_check"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_pac_provision_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_provision_combo"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_file_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "pac_file_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
gtk_widget_hide (widget);
}
diff --git a/panels/network/wireless-security/eap-method-fast.ui
b/panels/network/wireless-security/eap-method-fast.ui
index d7b19a679..c6470d1ed 100644
--- a/panels/network/wireless-security/eap-method-fast.ui
+++ b/panels/network/wireless-security/eap-method-fast.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model8">
+ <object class="GtkListStore" id="auth_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -12,7 +12,7 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model9">
+ <object class="GtkListStore" id="pac_provision_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -29,20 +29,20 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="eap_fast_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="eap_fast_anon_identity_label">
+ <object class="GtkLabel" id="anon_identity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Anony_mous identity</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_fast_anon_identity_entry</property>
+ <property name="mnemonic_widget">anon_identity_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -50,7 +50,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_fast_anon_identity_entry">
+ <object class="GtkEntry" id="anon_identity_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -62,13 +62,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_fast_pac_file_label">
+ <object class="GtkLabel" id="pac_file_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">PAC _file</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_fast_pac_file_button</property>
+ <property name="mnemonic_widget">pac_file_button</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -76,7 +76,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_fast_pac_file_button">
+ <object class="GtkFileChooserButton" id="pac_file_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -87,7 +87,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="eap_fast_inner_auth_vbox">
+ <object class="GtkBox" id="inner_auth_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@@ -102,13 +102,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_fast_inner_auth_label">
+ <object class="GtkLabel" id="inner_auth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Inner authentication</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_fast_inner_auth_combo</property>
+ <property name="mnemonic_widget">inner_auth_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -116,13 +116,13 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eap_fast_inner_auth_combo">
+ <object class="GtkComboBox" id="inner_auth_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model8</property>
+ <property name="model">auth_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer8"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -134,7 +134,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="eap_fast_pac_provision_checkbutton">
+ <object class="GtkCheckButton" id="pac_provision_check">
<property name="label" translatable="yes">Allow automatic PAC pro_visioning</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -148,11 +148,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eap_fast_pac_provision_combo">
+ <object class="GtkComboBox" id="pac_provision_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model9</property>
+ <property name="model">pac_provision_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
diff --git a/panels/network/wireless-security/eap-method-leap.c
b/panels/network/wireless-security/eap-method-leap.c
index 92010c61b..43ea0e021 100644
--- a/panels/network/wireless-security/eap-method-leap.c
+++ b/panels/network/wireless-security/eap-method-leap.c
@@ -50,7 +50,7 @@ show_toggled_cb (EAPMethodLEAP *method)
GtkWidget *widget;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapleap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
gtk_entry_set_visibility (method->password_entry, visible);
}
@@ -88,11 +88,11 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_username_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
}
@@ -113,7 +113,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (method->username_entry), NULL);
g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (method->password_entry), NULL);
- passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry"));
+ passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (passwd_entry);
/* Save 802.1X password flags to the connection */
@@ -131,7 +131,7 @@ static void
update_secrets (EAPMethod *parent, NMConnection *connection)
{
helper_fill_secret_entry (connection,
- GTK_ENTRY (gtk_builder_get_object (parent->builder,
"eap_leap_password_entry")),
+ GTK_ENTRY (gtk_builder_get_object (parent->builder, "password_entry")),
NM_TYPE_SETTING_802_1X,
(HelperSecretFunc) nm_setting_802_1x_get_password);
}
@@ -176,7 +176,7 @@ destroy (EAPMethod *parent)
EAPMethodLEAP *method = (EAPMethodLEAP *) parent;
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_grid"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
g_assert (widget);
g_signal_handlers_disconnect_by_data (widget, method);
@@ -208,8 +208,8 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
update_secrets,
destroy,
"/org/gnome/ControlCenter/network/eap-method-leap.ui",
- "eap_leap_grid",
- "eap_leap_username_entry",
+ "grid",
+ "username_entry",
FALSE);
if (!parent)
return NULL;
@@ -219,12 +219,12 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
method->editing_connection = secrets_only ? FALSE : TRUE;
method->ws_parent = ws_parent;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_grid"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
g_assert (widget);
g_signal_connect_swapped (widget, "realize", G_CALLBACK (widgets_realized), method);
g_signal_connect_swapped (widget, "unrealize", G_CALLBACK (widgets_unrealized), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_username_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_entry"));
g_assert (widget);
method->username_entry = GTK_ENTRY (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -232,7 +232,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
if (secrets_only)
gtk_widget_set_sensitive (widget, FALSE);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (widget);
method->password_entry = GTK_ENTRY (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -243,7 +243,7 @@ eap_method_leap_new (WirelessSecurity *ws_parent,
nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name,
FALSE, secrets_only);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapleap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
g_assert (widget);
method->show_password = GTK_TOGGLE_BUTTON (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), method);
diff --git a/panels/network/wireless-security/eap-method-leap.ui
b/panels/network/wireless-security/eap-method-leap.ui
index 743a7a5a5..b08802c15 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkGrid" id="eap_leap_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -11,13 +11,13 @@
<placeholder/>
</child>
<child>
- <object class="GtkLabel" id="eap_leap_username_label">
+ <object class="GtkLabel" id="username_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_leap_username_entry</property>
+ <property name="mnemonic_widget">username_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -25,13 +25,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_leap_password_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_leap_password_entry</property>
+ <property name="mnemonic_widget">password_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -39,7 +39,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_leap_password_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -52,7 +52,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_eapleap">
+ <object class="GtkCheckButton" id="show_password_check">
<property name="label" translatable="yes">Sho_w password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -67,7 +67,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_leap_username_entry">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/panels/network/wireless-security/eap-method-peap.c
b/panels/network/wireless-security/eap-method-peap.c
index 818a8b880..8a4095b76 100644
--- a/panels/network/wireless-security/eap-method-peap.c
+++ b/panels/network/wireless-security/eap-method-peap.c
@@ -59,18 +59,18 @@ validate (EAPMethod *parent, GError **error)
gboolean valid = FALSE;
g_autoptr(GError) local_error = NULL;
- if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_button")),
+ if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")),
TYPE_CA_CERT, NULL, NULL, &local_error)) {
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-PEAP CA certificate: %s"),
local_error->message);
return FALSE;
}
- if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_button")))) {
+ if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")))) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-PEAP CA certificate:
no certificate specified"));
return FALSE;
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
@@ -86,8 +86,8 @@ ca_cert_not_required_toggled (EAPMethodPEAP *self)
{
EAPMethod *parent = (EAPMethod *) self;
- eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_button")));
+ eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")));
wireless_security_notify_changed (self->sec_parent);
}
@@ -104,27 +104,27 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
g_object_unref (method->size_group);
method->size_group = g_object_ref (group);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "version_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
@@ -154,13 +154,13 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
nm_setting_802_1x_add_eap_method (s_8021x, "peap");
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
g_assert (widget);
text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
if (!nm_setting_802_1x_set_ca_cert (s_8021x, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format,
&error)) {
@@ -169,7 +169,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
}
eap_method_ca_cert_ignore_set (parent, connection, filename, ca_cert_error);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "version_combo"));
peapver_active = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
switch (peapver_active) {
case 1: /* PEAP v0 */
@@ -183,7 +183,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
break;
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter);
gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1);
@@ -195,22 +195,22 @@ static void
inner_auth_combo_changed_cb (EAPMethodPEAP *self)
{
EAPMethod *parent = (EAPMethod *) self;
- GtkWidget *combo, *vbox;
+ GtkWidget *combo, *box;
g_autoptr(EAPMethod) eap = NULL;
GList *elt, *children;
GtkTreeModel *model;
GtkTreeIter iter;
GtkWidget *eap_widget;
- vbox = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_vbox"));
- g_assert (vbox);
+ box = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_box"));
+ g_assert (box);
/* Remove any previous wireless security widgets */
- children = gtk_container_get_children (GTK_CONTAINER (vbox));
+ children = gtk_container_get_children (GTK_CONTAINER (box));
for (elt = children; elt; elt = g_list_next (elt))
- gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (elt->data));
+ gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (elt->data));
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1);
@@ -222,7 +222,7 @@ inner_auth_combo_changed_cb (EAPMethodPEAP *self)
if (self->size_group)
eap_method_add_to_size_group (eap, self->size_group);
- gtk_container_add (GTK_CONTAINER (vbox), eap_widget);
+ gtk_container_add (GTK_CONTAINER (box), eap_widget);
wireless_security_notify_changed (self->sec_parent);
}
@@ -301,7 +301,7 @@ inner_auth_combo_init (EAPMethodPEAP *method,
if (phase2_auth && !strcasecmp (phase2_auth, "gtc"))
active = 2;
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (combo);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (auth_model));
@@ -316,7 +316,7 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
{
eap_method_phase2_update_secrets_helper (parent,
connection,
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"eap_peap_inner_auth_combo")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"inner_auth_combo")),
I_METHOD_COLUMN);
}
@@ -346,8 +346,8 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
update_secrets,
destroy,
"/org/gnome/ControlCenter/network/eap-method-peap.ui",
- "eap_peap_grid",
- "eap_peap_anon_identity_entry",
+ "grid",
+ "anon_identity_entry",
FALSE);
if (!parent)
return NULL;
@@ -360,12 +360,12 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method);
widget_ca_not_required_checkbox = widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
g_assert (widget);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
@@ -387,7 +387,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
widget = inner_auth_combo_init (method, connection, s_8021x, secrets_only);
inner_auth_combo_changed_cb (method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "version_combo"));
g_assert (widget);
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
if (s_8021x) {
@@ -404,29 +404,29 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
}
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
if (secrets_only) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_peap_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "version_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "version_combo"));
gtk_widget_hide (widget);
}
diff --git a/panels/network/wireless-security/eap-method-peap.ui
b/panels/network/wireless-security/eap-method-peap.ui
index d24f5c1d9..8190d4898 100644
--- a/panels/network/wireless-security/eap-method-peap.ui
+++ b/panels/network/wireless-security/eap-method-peap.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model8">
+ <object class="GtkListStore" id="auth_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -12,7 +12,7 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model9">
+ <object class="GtkListStore" id="version_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -29,19 +29,19 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="eap_peap_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="eap_peap_anon_identity_label">
+ <object class="GtkLabel" id="anon_identity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Anony_mous identity</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_peap_anon_identity_entry</property>
+ <property name="mnemonic_widget">anon_identity_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -49,7 +49,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_peap_anon_identity_entry">
+ <object class="GtkEntry" id="anon_identity_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -61,13 +61,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_peap_ca_cert_label">
+ <object class="GtkLabel" id="ca_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">C_A certificate</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_peap_ca_cert_button</property>
+ <property name="mnemonic_widget">ca_cert_button</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -75,7 +75,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_peap_ca_cert_button">
+ <object class="GtkFileChooserButton" id="ca_cert_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -86,7 +86,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="eap_peap_ca_cert_not_required_checkbox">
+ <object class="GtkCheckButton" id="ca_cert_not_required_check">
<property name="label" translatable="yes">No CA certificate is _required</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -101,13 +101,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_peap_version_label">
+ <object class="GtkLabel" id="version_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">PEAP _version</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_peap_version_combo</property>
+ <property name="mnemonic_widget">version_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -115,11 +115,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eap_peap_version_combo">
+ <object class="GtkComboBox" id="version_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model9</property>
+ <property name="model">version_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -133,13 +133,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_peap_inner_auth_label">
+ <object class="GtkLabel" id="inner_auth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Inner authentication</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_peap_inner_auth_combo</property>
+ <property name="mnemonic_widget">inner_auth_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -147,11 +147,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eap_peap_inner_auth_combo">
+ <object class="GtkComboBox" id="inner_auth_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model8</property>
+ <property name="model">auth_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -165,7 +165,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="eap_peap_inner_auth_vbox">
+ <object class="GtkBox" id="inner_auth_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/wireless-security/eap-method-simple.c
b/panels/network/wireless-security/eap-method-simple.c
index 2e36e0dcb..434d2f6da 100644
--- a/panels/network/wireless-security/eap-method-simple.c
+++ b/panels/network/wireless-security/eap-method-simple.c
@@ -52,7 +52,7 @@ show_toggled_cb (EAPMethodSimple *self)
GtkWidget *widget;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
gtk_entry_set_visibility (self->password_entry, visible);
}
@@ -102,11 +102,11 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_username_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
}
@@ -180,7 +180,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
/* Update secret flags and popup when editing the connection */
if (!(method->flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY)) {
- GtkWidget *passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_simple_password_entry"));
+ GtkWidget *passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"password_entry"));
g_assert (passwd_entry);
nma_utils_update_password_storage (passwd_entry, flags,
@@ -192,7 +192,7 @@ static void
update_secrets (EAPMethod *parent, NMConnection *connection)
{
helper_fill_secret_entry (connection,
- GTK_ENTRY (gtk_builder_get_object (parent->builder,
"eap_simple_password_entry")),
+ GTK_ENTRY (gtk_builder_get_object (parent->builder, "password_entry")),
NM_TYPE_SETTING_802_1X,
(HelperSecretFunc) nm_setting_802_1x_get_password);
}
@@ -266,7 +266,7 @@ destroy (EAPMethod *parent)
EAPMethodSimple *method = (EAPMethodSimple *) parent;
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_grid"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
g_assert (widget);
g_signal_handlers_disconnect_by_data (widget, method);
@@ -302,8 +302,8 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
update_secrets,
destroy,
"/org/gnome/ControlCenter/network/eap-method-simple.ui",
- "eap_simple_grid",
- "eap_simple_username_entry",
+ "grid",
+ "username_entry",
flags & EAP_METHOD_SIMPLE_FLAG_PHASE2);
if (!parent)
return NULL;
@@ -315,12 +315,12 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
method->type = type;
g_assert (type < EAP_METHOD_SIMPLE_TYPE_LAST);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_grid"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
g_assert (widget);
g_signal_connect_swapped (widget, "realize", G_CALLBACK (widgets_realized), method);
g_signal_connect_swapped (widget, "unrealize", G_CALLBACK (widgets_unrealized), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_username_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_entry"));
g_assert (widget);
method->username_entry = GTK_ENTRY (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -328,7 +328,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
if (method->flags & EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY)
gtk_widget_set_sensitive (widget, FALSE);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_simple_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (widget);
method->password_entry = GTK_ENTRY (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -341,7 +341,7 @@ eap_method_simple_new (WirelessSecurity *ws_parent,
g_signal_connect_swapped (method->password_entry, "notify::secondary-icon-name", G_CALLBACK
(password_storage_changed), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
g_assert (widget);
method->show_password = GTK_TOGGLE_BUTTON (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), method);
diff --git a/panels/network/wireless-security/eap-method-simple.ui
b/panels/network/wireless-security/eap-method-simple.ui
index 1da8dc235..00799ac93 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkGrid" id="eap_simple_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -11,13 +11,13 @@
<placeholder/>
</child>
<child>
- <object class="GtkLabel" id="eap_simple_username_label">
+ <object class="GtkLabel" id="username_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_simple_username_entry</property>
+ <property name="mnemonic_widget">username_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -25,13 +25,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_simple_password_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_simple_password_entry</property>
+ <property name="mnemonic_widget">password_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -39,7 +39,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_simple_password_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -52,7 +52,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_simple_username_entry">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -70,7 +70,7 @@
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_eapsimple">
+ <object class="GtkCheckButton" id="show_password_check">
<property name="label" translatable="yes">Sho_w password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/panels/network/wireless-security/eap-method-tls.c
b/panels/network/wireless-security/eap-method-tls.c
index 4c758bb64..5d261ddb8 100644
--- a/panels/network/wireless-security/eap-method-tls.c
+++ b/panels/network/wireless-security/eap-method-tls.c
@@ -46,10 +46,10 @@ show_toggled_cb (EAPMethodTLS *self)
GtkWidget *widget;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "show_checkbutton_eaptls"));
+ widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "show_password_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "eap_tls_private_key_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (method->builder, "private_key_password_entry"));
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
}
@@ -64,7 +64,7 @@ validate (EAPMethod *parent, GError **error)
g_autoptr(GError) user_cert_error = NULL;
gboolean ret = TRUE;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "identity_entry"));
g_assert (widget);
identity = gtk_entry_get_text (GTK_ENTRY (widget));
if (!identity || !strlen (identity)) {
@@ -75,27 +75,27 @@ validate (EAPMethod *parent, GError **error)
widget_unset_error (widget);
}
- if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")),
+ if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")),
TYPE_CA_CERT, NULL, NULL, &ca_cert_error)) {
- widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")));
+ widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button")));
if (ret) {
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS CA certificate:
%s"), ca_cert_error->message);
ret = FALSE;
}
- } else if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")))) {
- widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")));
+ } else if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")))) {
+ widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button")));
if (ret) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS CA
certificate: no certificate specified"));
ret = FALSE;
}
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_password_entry"));
g_assert (widget);
password = gtk_entry_get_text (GTK_ENTRY (widget));
- if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_button")),
+ if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"private_key_button")),
TYPE_PRIVATE_KEY,
password,
&format,
@@ -104,17 +104,17 @@ validate (EAPMethod *parent, GError **error)
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS private-key:
%s"), private_key_error->message);
ret = FALSE;
}
- widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_button")));
+ widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"private_key_button")));
}
if (format != NM_SETTING_802_1X_CK_FORMAT_PKCS12) {
- if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object
(parent->builder, "eap_tls_user_cert_button")),
+ if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object
(parent->builder, "user_cert_button")),
TYPE_CLIENT_CERT, NULL, NULL, &user_cert_error)) {
if (ret) {
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TLS
user-certificate: %s"), user_cert_error->message);
ret = FALSE;
}
- widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_user_cert_button")));
+ widget_set_error (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"user_cert_button")));
}
}
@@ -126,8 +126,8 @@ ca_cert_not_required_toggled (EAPMethodTLS *self)
{
EAPMethod *parent = (EAPMethod *) self;
- eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")));
+ eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")));
wireless_security_notify_changed (self->sec_parent);
}
@@ -136,27 +136,27 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "identity_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "user_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_password_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
}
@@ -182,18 +182,18 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
else
nm_setting_802_1x_add_eap_method (s_8021x, "tls");
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "identity_entry"));
g_assert (widget);
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
/* TLS private key */
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_password_entry"));
g_assert (widget);
password = gtk_entry_get_text (GTK_ENTRY (widget));
g_assert (password);
passwd_entry = widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_button"));
g_assert (widget);
pk_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
g_assert (pk_filename);
@@ -226,7 +226,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
/* If the key is pkcs#12 nm_setting_802_1x_set_private_key() already
* set the client certificate for us.
*/
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "user_cert_button"));
g_assert (widget);
cc_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
g_assert (cc_filename);
@@ -244,7 +244,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
}
/* TLS CA certificate */
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
g_assert (widget);
ca_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -273,7 +273,7 @@ private_key_picker_helper (EAPMethod *parent, const char *filename, gboolean cha
const char *password;
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_password_entry"));
g_assert (widget);
password = gtk_entry_get_text (GTK_ENTRY (widget));
@@ -281,7 +281,7 @@ private_key_picker_helper (EAPMethod *parent, const char *filename, gboolean cha
nm_setting_802_1x_set_private_key (setting, filename, password, NM_SETTING_802_1X_CK_SCHEME_PATH,
&cert_format, NULL);
/* With PKCS#12, the client cert must be the same as the private key */
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "user_cert_button"));
if (cert_format == NM_SETTING_802_1X_CK_FORMAT_PKCS12) {
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (widget));
gtk_widget_set_sensitive (widget, FALSE);
@@ -412,7 +412,7 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
}
helper_fill_secret_entry (connection,
- GTK_ENTRY (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_password_entry")),
+ GTK_ENTRY (gtk_builder_get_object (parent->builder,
"private_key_password_entry")),
NM_TYPE_SETTING_802_1X,
password_func);
@@ -421,7 +421,7 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
if (s_8021x && (scheme_func (s_8021x) == NM_SETTING_802_1X_CK_SCHEME_PATH)) {
filename = path_func (s_8021x);
if (filename) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_button"));
g_assert (widget);
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), filename);
}
@@ -447,8 +447,8 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
update_secrets,
NULL,
"/org/gnome/ControlCenter/network/eap-method-tls.ui",
- "eap_tls_grid",
- "eap_tls_identity_entry",
+ "grid",
+ "identity_entry",
phase2);
if (!parent)
return NULL;
@@ -463,29 +463,29 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "identity_entry"));
g_assert (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
if (s_8021x && nm_setting_802_1x_get_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x));
- setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"eap_tls_user_cert_button")),
+ setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"user_cert_button")),
_("Choose your personal certificate"),
ws_parent, parent, s_8021x,
phase2 ? nm_setting_802_1x_get_phase2_client_cert_scheme :
nm_setting_802_1x_get_client_cert_scheme,
phase2 ? nm_setting_802_1x_get_phase2_client_cert_path :
nm_setting_802_1x_get_client_cert_path,
FALSE, TRUE);
- setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_button")),
+ setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_button")),
_("Choose a Certificate Authority certificate"),
ws_parent, parent, s_8021x,
phase2 ? nm_setting_802_1x_get_phase2_ca_cert_scheme :
nm_setting_802_1x_get_ca_cert_scheme,
phase2 ? nm_setting_802_1x_get_phase2_ca_cert_path :
nm_setting_802_1x_get_ca_cert_path,
FALSE, FALSE);
- setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"eap_tls_private_key_button")),
+ setup_filepicker (GTK_FILE_CHOOSER_BUTTON (gtk_builder_get_object (parent->builder,
"private_key_button")),
_("Choose your private key"),
ws_parent, parent, s_8021x,
phase2 ? nm_setting_802_1x_get_phase2_private_key_scheme :
nm_setting_802_1x_get_private_key_scheme,
@@ -493,17 +493,17 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
TRUE, FALSE);
if (connection && eap_method_ca_cert_ignore_get (parent, connection)) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
ca_not_required = !gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required);
/* Fill secrets, if any */
if (connection)
update_secrets (parent, connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_password_entry"));
g_assert (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -511,26 +511,26 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
nma_utils_setup_password_storage (widget, 0, (NMSetting *) s_8021x, parent->password_flags_name,
FALSE, secrets_only);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eaptls"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), method);
if (secrets_only) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "identity_entry"));
gtk_widget_set_sensitive (widget, FALSE);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "user_cert_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "user_cert_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "private_key_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
gtk_widget_hide (widget);
}
diff --git a/panels/network/wireless-security/eap-method-tls.ui
b/panels/network/wireless-security/eap-method-tls.ui
index e57135a20..194ac41e5 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkGrid" id="eap_tls_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -11,13 +11,13 @@
<placeholder/>
</child>
<child>
- <object class="GtkLabel" id="eap_tls_identity_label">
+ <object class="GtkLabel" id="identity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">I_dentity</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_tls_identity_entry</property>
+ <property name="mnemonic_widget">identity_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -25,7 +25,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_tls_identity_entry">
+ <object class="GtkEntry" id="identity_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -37,13 +37,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_tls_user_cert_label">
+ <object class="GtkLabel" id="user_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_User certificate</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_tls_user_cert_button</property>
+ <property name="mnemonic_widget">user_cert_button</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -51,7 +51,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_tls_user_cert_button">
+ <object class="GtkFileChooserButton" id="user_cert_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -62,13 +62,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_tls_ca_cert_label">
+ <object class="GtkLabel" id="ca_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">C_A certificate</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_tls_ca_cert_button</property>
+ <property name="mnemonic_widget">ca_cert_button</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -76,7 +76,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_tls_ca_cert_button">
+ <object class="GtkFileChooserButton" id="ca_cert_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -87,7 +87,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="eap_tls_ca_cert_not_required_checkbox">
+ <object class="GtkCheckButton" id="ca_cert_not_required_check">
<property name="label" translatable="yes">No CA certificate is _required</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -102,13 +102,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_tls_private_key_label">
+ <object class="GtkLabel" id="private_key_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Private _key</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_tls_private_key_button</property>
+ <property name="mnemonic_widget">private_key_button</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -116,7 +116,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_tls_private_key_button">
+ <object class="GtkFileChooserButton" id="private_key_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -127,13 +127,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_tls_private_key_password_label">
+ <object class="GtkLabel" id="private_key_password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Private key password</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_tls_private_key_password_entry</property>
+ <property name="mnemonic_widget">private_key_password_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -141,7 +141,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_tls_private_key_password_entry">
+ <object class="GtkEntry" id="private_key_password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -154,7 +154,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_eaptls">
+ <object class="GtkCheckButton" id="show_password_check">
<property name="label" translatable="yes">Sho_w password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/panels/network/wireless-security/eap-method-ttls.c
b/panels/network/wireless-security/eap-method-ttls.c
index 152aaac20..81ebc1553 100644
--- a/panels/network/wireless-security/eap-method-ttls.c
+++ b/panels/network/wireless-security/eap-method-ttls.c
@@ -59,18 +59,18 @@ validate (EAPMethod *parent, GError **error)
gboolean valid = FALSE;
g_autoptr(GError) local_error = NULL;
- if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_button")),
+ if (!eap_method_validate_filepicker (GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")),
TYPE_CA_CERT, NULL, NULL, &local_error)) {
g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TTLS CA certificate: %s"),
local_error->message);
return FALSE;
}
- if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_button")))) {
+ if (eap_method_ca_cert_required (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")))) {
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("invalid EAP-TTLS CA certificate:
no certificate specified"));
return FALSE;
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
@@ -85,8 +85,8 @@ static void
ca_cert_not_required_toggled (EAPMethodTTLS *self)
{
EAPMethod *parent = (EAPMethod *) self;
- eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_not_required_checkbox")),
- GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_button")));
+ eap_method_ca_cert_not_required_toggled (GTK_TOGGLE_BUTTON (gtk_builder_get_object (parent->builder,
"ca_cert_not_required_check")),
+ GTK_FILE_CHOOSER (gtk_builder_get_object (parent->builder,
"ca_cert_button")));
wireless_security_notify_changed (self->sec_parent);
}
@@ -103,27 +103,27 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
g_object_unref (method->size_group);
method->size_group = g_object_ref (group);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_match_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "domain_match_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (widget);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
@@ -152,19 +152,19 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
nm_setting_802_1x_add_eap_method (s_8021x, "ttls");
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
g_assert (widget);
text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_match_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "domain_match_entry"));
g_assert (widget);
text = gtk_entry_get_text (GTK_ENTRY (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, text, NULL);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
if (!nm_setting_802_1x_set_ca_cert (s_8021x, filename, NM_SETTING_802_1X_CK_SCHEME_PATH, &format,
&error)) {
@@ -173,7 +173,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
}
eap_method_ca_cert_ignore_set (parent, connection, filename, ca_cert_error);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter);
gtk_tree_model_get (model, &iter, I_METHOD_COLUMN, &eap, -1);
@@ -186,21 +186,21 @@ static void
inner_auth_combo_changed_cb (EAPMethodTTLS *self)
{
EAPMethod *parent = (EAPMethod *) self;
- GtkWidget *combo, *vbox;
+ GtkWidget *combo, *box;
g_autoptr(EAPMethod) eap = NULL;
GList *elt, *children;
GtkTreeModel *model;
GtkTreeIter iter;
GtkWidget *eap_widget;
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
- vbox = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_vbox"));
- g_assert (vbox);
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
+ box = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_box"));
+ g_assert (box);
/* Remove any previous wireless security widgets */
- children = gtk_container_get_children (GTK_CONTAINER (vbox));
+ children = gtk_container_get_children (GTK_CONTAINER (box));
for (elt = children; elt; elt = g_list_next (elt))
- gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (elt->data));
+ gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (elt->data));
g_list_free (children);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
@@ -214,7 +214,7 @@ inner_auth_combo_changed_cb (EAPMethodTTLS *self)
if (self->size_group)
eap_method_add_to_size_group (eap, self->size_group);
- gtk_container_add (GTK_CONTAINER (vbox), eap_widget);
+ gtk_container_add (GTK_CONTAINER (box), eap_widget);
wireless_security_notify_changed (self->sec_parent);
}
@@ -355,7 +355,7 @@ inner_auth_combo_init (EAPMethodTTLS *method,
if (phase2_auth && !strcasecmp (phase2_auth, "gtc"))
active = 6;
- combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
+ combo = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
g_assert (combo);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (auth_model));
@@ -370,7 +370,7 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
{
eap_method_phase2_update_secrets_helper (parent,
connection,
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"eap_ttls_inner_auth_combo")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"inner_auth_combo")),
I_METHOD_COLUMN);
}
@@ -400,8 +400,8 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
update_secrets,
destroy,
"/org/gnome/ControlCenter/network/eap-method-ttls.ui",
- "eap_ttls_grid",
- "eap_ttls_anon_identity_entry",
+ "grid",
+ "anon_identity_entry",
FALSE);
if (!parent)
return NULL;
@@ -414,12 +414,12 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
if (connection)
s_8021x = nm_connection_get_setting_802_1x (connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method);
widget_ca_not_required_checkbox = widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
g_assert (widget);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
@@ -438,11 +438,11 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
!filename && eap_method_ca_cert_ignore_get (parent,
connection));
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_match_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "domain_match_entry"));
if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), method);
@@ -451,23 +451,23 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
inner_auth_combo_changed_cb (method);
if (secrets_only) {
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_anon_identity_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_anon_identity_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "anon_identity_entry"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_match_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "domain_match_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_match_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "domain_match_entry"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_button"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_ttls_ca_cert_not_required_checkbox"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "ca_cert_not_required_check"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_label"));
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "inner_auth_combo"));
gtk_widget_hide (widget);
}
diff --git a/panels/network/wireless-security/eap-method-ttls.ui
b/panels/network/wireless-security/eap-method-ttls.ui
index 91b318b62..519d99379 100644
--- a/panels/network/wireless-security/eap-method-ttls.ui
+++ b/panels/network/wireless-security/eap-method-ttls.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model6">
+ <object class="GtkListStore" id="auth_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -12,19 +12,19 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="eap_ttls_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="eap_ttls_anon_identity_label">
+ <object class="GtkLabel" id="anon_identity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Anony_mous identity</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_ttls_anon_identity_entry</property>
+ <property name="mnemonic_widget">anon_identity_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -32,7 +32,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_ttls_anon_identity_entry">
+ <object class="GtkEntry" id="anon_identity_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -44,12 +44,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_ttls_domain_match_label">
+ <object class="GtkLabel" id="domain_match_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Domain</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_ttls_domain_match_entry</property>
+ <property name="mnemonic_widget">domain_match_entry</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -58,7 +58,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="eap_ttls_domain_match_entry">
+ <object class="GtkEntry" id="domain_match_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -70,12 +70,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_ttls_ca_cert_label">
+ <object class="GtkLabel" id="ca_cert_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">C_A certificate</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_ttls_ca_cert_button</property>
+ <property name="mnemonic_widget">ca_cert_button</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -84,7 +84,7 @@
</packing>
</child>
<child>
- <object class="GtkFileChooserButton" id="eap_ttls_ca_cert_button">
+ <object class="GtkFileChooserButton" id="ca_cert_button">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
@@ -95,7 +95,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="eap_ttls_ca_cert_not_required_checkbox">
+ <object class="GtkCheckButton" id="ca_cert_not_required_check">
<property name="label" translatable="yes">No CA certificate is _required</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -111,12 +111,12 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="eap_ttls_inner_auth_label">
+ <object class="GtkLabel" id="inner_auth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Inner authentication</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">eap_ttls_inner_auth_combo</property>
+ <property name="mnemonic_widget">inner_auth_combo</property>
<property name="xalign">1</property>
</object>
<packing>
@@ -125,11 +125,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="eap_ttls_inner_auth_combo">
+ <object class="GtkComboBox" id="inner_auth_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model6</property>
+ <property name="model">auth_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -143,7 +143,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="eap_ttls_inner_auth_vbox">
+ <object class="GtkBox" id="inner_auth_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c
b/panels/network/wireless-security/ws-dynamic-wep.c
index cbfce97c9..2d28295d7 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -47,13 +47,13 @@ destroy (WirelessSecurity *parent)
static GtkWidget *
get_widget (WirelessSecurity *parent)
{
- return GTK_WIDGET (gtk_builder_get_object (parent->builder, "dynamic_wep_grid"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
}
static gboolean
validate (WirelessSecurity *parent, GError **error)
{
- return ws_802_1x_validate (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_combo")), error);
+ return ws_802_1x_validate (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
error);
}
static void
@@ -66,8 +66,8 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
sec->size_group = g_object_ref (group);
ws_802_1x_add_to_size_group (sec->size_group,
- GTK_LABEL (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_label")),
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_combo")));
+ GTK_LABEL (gtk_builder_get_object (parent->builder, "auth_label")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")));
}
static void
@@ -75,7 +75,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
{
NMSettingWirelessSecurity *s_wireless_sec;
- ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_combo")), connection);
+ ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
connection);
s_wireless_sec = nm_connection_get_setting_wireless_security (connection);
g_assert (s_wireless_sec);
@@ -91,7 +91,7 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
ws_802_1x_auth_combo_changed (combo,
parent,
- GTK_BOX (gtk_builder_get_object (parent->builder,
"dynamic_wep_method_vbox")),
+ GTK_BOX (gtk_builder_get_object (parent->builder, "method_box")),
sec->size_group);
}
@@ -116,13 +116,13 @@ ws_dynamic_wep_new (NMConnection *connection,
wireless_security_set_hotspot_compatible (parent, FALSE);
ws_802_1x_auth_combo_init (parent,
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_combo")),
- GTK_LABEL (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_label")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
+ GTK_LABEL (gtk_builder_get_object (parent->builder, "auth_label")),
(GCallback) auth_combo_changed_cb,
connection,
is_editor,
secrets_only);
- auth_combo_changed_cb (GTK_WIDGET (gtk_builder_get_object (parent->builder,
"dynamic_wep_auth_combo")), (gpointer) parent);
+ auth_combo_changed_cb (GTK_WIDGET (gtk_builder_get_object (parent->builder, "auth_combo")),
(gpointer) parent);
return (WirelessSecurityDynamicWEP *) parent;
}
diff --git a/panels/network/wireless-security/ws-dynamic-wep.ui
b/panels/network/wireless-security/ws-dynamic-wep.ui
index acfcc82b2..354467624 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.ui
+++ b/panels/network/wireless-security/ws-dynamic-wep.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model7">
+ <object class="GtkListStore" id="auth_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -12,19 +12,19 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="dynamic_wep_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="dynamic_wep_auth_label">
+ <object class="GtkLabel" id="auth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Au_thentication</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">dynamic_wep_auth_combo</property>
+ <property name="mnemonic_widget">auth_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -32,11 +32,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="dynamic_wep_auth_combo">
+ <object class="GtkComboBox" id="auth_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model7</property>
+ <property name="model">auth_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -50,7 +50,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="dynamic_wep_method_vbox">
+ <object class="GtkBox" id="method_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c
index 814819358..860883bb6 100644
--- a/panels/network/wireless-security/ws-leap.c
+++ b/panels/network/wireless-security/ws-leap.c
@@ -43,17 +43,17 @@ show_toggled_cb (WirelessSecurityLEAP *self)
GtkWidget *widget;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "show_checkbutton_leap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "show_password_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "leap_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "password_entry"));
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
}
static GtkWidget *
get_widget (WirelessSecurity *parent)
{
- return GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_grid"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
}
static gboolean
@@ -63,7 +63,7 @@ validate (WirelessSecurity *parent, GError **error)
const char *text;
gboolean ret = TRUE;
- entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_entry"));
+ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_entry"));
g_assert (entry);
text = gtk_entry_get_text (GTK_ENTRY (entry));
if (!text || !strlen (text)) {
@@ -73,7 +73,7 @@ validate (WirelessSecurity *parent, GError **error)
} else
widget_unset_error (entry);
- entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry"));
+ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (entry);
text = gtk_entry_get_text (GTK_ENTRY (entry));
if (!text || !strlen (text)) {
@@ -93,10 +93,10 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_label"));
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_label"));
gtk_size_group_add_widget (group, widget);
}
@@ -113,10 +113,10 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_entry"));
leap_username = gtk_entry_get_text (GTK_ENTRY (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
passwd_entry = widget;
leap_password = gtk_entry_get_text (GTK_ENTRY (widget));
@@ -142,7 +142,7 @@ static void
update_secrets (WirelessSecurity *parent, NMConnection *connection)
{
helper_fill_secret_entry (connection,
- GTK_ENTRY (gtk_builder_get_object (parent->builder, "leap_password_entry")),
+ GTK_ENTRY (gtk_builder_get_object (parent->builder, "password_entry")),
NM_TYPE_SETTING_WIRELESS_SECURITY,
(HelperSecretFunc) nm_setting_wireless_security_get_leap_password);
}
@@ -189,7 +189,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
sec->editing_connection = secrets_only ? FALSE : TRUE;
sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), sec);
@@ -200,7 +200,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
if (wsec)
update_secrets (WIRELESS_SECURITY (sec), connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "username_entry"));
g_assert (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), sec);
if (wsec)
@@ -209,7 +209,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
if (secrets_only)
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_leap"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), sec);
diff --git a/panels/network/wireless-security/ws-leap.ui b/panels/network/wireless-security/ws-leap.ui
index 449397517..cba9c6c8b 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkGrid" id="leap_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -11,13 +11,13 @@
<placeholder/>
</child>
<child>
- <object class="GtkLabel" id="leap_username_label">
+ <object class="GtkLabel" id="username_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Username</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">leap_username_entry</property>
+ <property name="mnemonic_widget">username_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -25,13 +25,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="leap_password_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">leap_password_entry</property>
+ <property name="mnemonic_widget">password_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -39,7 +39,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="leap_password_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -52,7 +52,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_leap">
+ <object class="GtkCheckButton" id="show_password_check">
<property name="label" translatable="yes">Sho_w password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -67,7 +67,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="leap_username_entry">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c
index d2527e5d6..fd3c07b22 100644
--- a/panels/network/wireless-security/ws-wep-key.c
+++ b/panels/network/wireless-security/ws-wep-key.c
@@ -48,10 +48,10 @@ show_toggled_cb (WirelessSecurityWEPKey *self)
GtkWidget *widget, *button;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
g_assert (widget);
- button = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wep"));
+ button = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_key_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
}
@@ -65,7 +65,7 @@ key_index_combo_changed_cb (WirelessSecurityWEPKey *self)
int key_index;
/* Save WEP key for old key index */
- entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
key = gtk_entry_get_text (GTK_ENTRY (entry));
if (key)
g_strlcpy (self->keys[self->cur_index], key, sizeof (self->keys[self->cur_index]));
@@ -97,7 +97,7 @@ destroy (WirelessSecurity *parent)
static GtkWidget *
get_widget (WirelessSecurity *parent)
{
- return GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_grid"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
}
static gboolean
@@ -108,7 +108,7 @@ validate (WirelessSecurity *parent, GError **error)
const char *key;
int i;
- entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
g_assert (entry);
key = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -163,7 +163,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "auth_method_label"));
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_label"));
gtk_size_group_add_widget (group, widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_index_label"));
@@ -184,7 +184,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "auth_method_combo"));
auth_alg = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
passwd_entry = widget;
key = gtk_entry_get_text (GTK_ENTRY (widget));
g_strlcpy (sec->keys[sec->cur_index], key, sizeof (sec->keys[sec->cur_index]));
@@ -224,7 +224,7 @@ wep_entry_filter_cb (WirelessSecurityWEPKey *self,
WirelessSecurity *parent = (WirelessSecurity *) self;
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
if (self->type == NM_WEP_KEY_TYPE_KEY) {
int i, count = 0;
g_autofree gchar *result = g_new (gchar, length+1);
@@ -260,7 +260,7 @@ update_secrets (WirelessSecurity *parent, NMConnection *connection)
g_strlcpy (sec->keys[i], tmp, sizeof (sec->keys[i]));
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
if (strlen (sec->keys[sec->cur_index]))
gtk_entry_set_text (GTK_ENTRY (widget), sec->keys[sec->cur_index]);
}
@@ -301,7 +301,7 @@ ws_wep_key_new (NMConnection *connection,
sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_WEP_KEY0;
sec->type = type;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "key_entry"));
g_assert (widget);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 28);
@@ -354,7 +354,7 @@ ws_wep_key_new (NMConnection *connection,
if (connection)
update_secrets (WIRELESS_SECURITY (sec), connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wep"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_key_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), sec);
diff --git a/panels/network/wireless-security/ws-wep-key.ui b/panels/network/wireless-security/ws-wep-key.ui
index 7e3594918..b987d7fca 100644
--- a/panels/network/wireless-security/ws-wep-key.ui
+++ b/panels/network/wireless-security/ws-wep-key.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model4">
+ <object class="GtkListStore" id="key_index_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -21,7 +21,7 @@
</row>
</data>
</object>
- <object class="GtkListStore" id="model3">
+ <object class="GtkListStore" id="auth_method_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -35,19 +35,19 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="wep_key_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="wep_key_label">
+ <object class="GtkLabel" id="key_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Key</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">wep_key_entry</property>
+ <property name="mnemonic_widget">key_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -55,7 +55,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="wep_key_entry">
+ <object class="GtkEntry" id="key_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -80,7 +80,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_wep">
+ <object class="GtkCheckButton" id="show_key_check">
<property name="label" translatable="yes">Sho_w key</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -113,7 +113,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model3</property>
+ <property name="model">auth_method_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -145,7 +145,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model4</property>
+ <property name="model">key_index_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index d2dbd6a88..1a8e791ae 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -48,13 +48,13 @@ destroy (WirelessSecurity *parent)
static GtkWidget *
get_widget (WirelessSecurity *parent)
{
- return GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_eap_grid"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
}
static gboolean
validate (WirelessSecurity *parent, GError **error)
{
- return ws_802_1x_validate (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"wpa_eap_auth_combo")), error);
+ return ws_802_1x_validate (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
error);
}
static void
@@ -67,8 +67,8 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
sec->size_group = g_object_ref (group);
ws_802_1x_add_to_size_group (sec->size_group,
- GTK_LABEL (gtk_builder_get_object (parent->builder,
"wpa_eap_auth_label")),
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"wpa_eap_auth_combo")));
+ GTK_LABEL (gtk_builder_get_object (parent->builder, "auth_label")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")));
}
static void
@@ -76,7 +76,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
{
NMSettingWirelessSecurity *s_wireless_sec;
- ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"wpa_eap_auth_combo")), connection);
+ ws_802_1x_fill_connection (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
connection);
s_wireless_sec = nm_connection_get_setting_wireless_security (connection);
g_assert (s_wireless_sec);
@@ -92,7 +92,7 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
ws_802_1x_auth_combo_changed (combo,
parent,
- GTK_BOX (gtk_builder_get_object (parent->builder,
"wpa_eap_method_vbox")),
+ GTK_BOX (gtk_builder_get_object (parent->builder, "method_box")),
sec->size_group);
}
@@ -117,13 +117,13 @@ ws_wpa_eap_new (NMConnection *connection,
wireless_security_set_hotspot_compatible (parent, FALSE);
ws_802_1x_auth_combo_init (parent,
- GTK_COMBO_BOX (gtk_builder_get_object (parent->builder,
"wpa_eap_auth_combo")),
- GTK_LABEL (gtk_builder_get_object (parent->builder, "wpa_eap_auth_label")),
+ GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, "auth_combo")),
+ GTK_LABEL (gtk_builder_get_object (parent->builder, "auth_label")),
(GCallback) auth_combo_changed_cb,
connection,
is_editor,
secrets_only);
- auth_combo_changed_cb (GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_eap_auth_combo")),
parent);
+ auth_combo_changed_cb (GTK_WIDGET (gtk_builder_get_object (parent->builder, "auth_combo")), parent);
return (WirelessSecurityWPAEAP *) parent;
}
diff --git a/panels/network/wireless-security/ws-wpa-eap.ui b/panels/network/wireless-security/ws-wpa-eap.ui
index 4c22420fa..bf0d673dd 100644
--- a/panels/network/wireless-security/ws-wpa-eap.ui
+++ b/panels/network/wireless-security/ws-wpa-eap.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkListStore" id="model5">
+ <object class="GtkListStore" id="auth_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
@@ -12,19 +12,19 @@
</row>
</data>
</object>
- <object class="GtkGrid" id="wpa_eap_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="wpa_eap_auth_label">
+ <object class="GtkLabel" id="auth_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Au_thentication</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">wpa_eap_auth_combo</property>
+ <property name="mnemonic_widget">auth_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -32,11 +32,11 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="wpa_eap_auth_combo">
+ <object class="GtkComboBox" id="auth_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="model">model5</property>
+ <property name="model">auth_model</property>
<child>
<object class="GtkCellRendererText"/>
<attributes>
@@ -50,7 +50,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="wpa_eap_method_vbox">
+ <object class="GtkBox" id="method_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c
index 31e071628..a02d38c5e 100644
--- a/panels/network/wireless-security/ws-wpa-psk.c
+++ b/panels/network/wireless-security/ws-wpa-psk.c
@@ -43,7 +43,7 @@ struct _WirelessSecurityWPAPSK {
static GtkWidget *
get_widget (WirelessSecurity *parent)
{
- return GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_grid"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "grid"));
}
static void
@@ -53,10 +53,10 @@ show_toggled_cb (WirelessSecurityWPAPSK *self)
GtkWidget *widget;
gboolean visible;
- widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "show_checkbutton_wpa"));
+ widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "show_password_check"));
visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
- widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "wpa_psk_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (sec->builder, "password_entry"));
gtk_entry_set_visibility (GTK_ENTRY (widget), visible);
}
@@ -68,7 +68,7 @@ validate (WirelessSecurity *parent, GError **error)
gsize len;
int i;
- entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry"));
+ entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (entry);
key = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -101,10 +101,10 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
{
GtkWidget *widget;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_type_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "type_label"));
gtk_size_group_add_widget (group, widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_label"));
gtk_size_group_add_widget (group, widget);
}
@@ -131,7 +131,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
s_wireless_sec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new ();
nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
passwd_entry = widget;
key = gtk_entry_get_text (GTK_ENTRY (widget));
g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
@@ -170,7 +170,7 @@ static void
update_secrets (WirelessSecurity *parent, NMConnection *connection)
{
helper_fill_secret_entry (connection,
- GTK_ENTRY (gtk_builder_get_object (parent->builder, "wpa_psk_entry")),
+ GTK_ENTRY (gtk_builder_get_object (parent->builder, "password_entry")),
NM_TYPE_SETTING_WIRELESS_SECURITY,
(HelperSecretFunc) nm_setting_wireless_security_get_psk);
}
@@ -204,7 +204,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
sec->editing_connection = secrets_only ? FALSE : TRUE;
sec->password_flags_name = NM_SETTING_WIRELESS_SECURITY_PSK;
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "password_entry"));
g_assert (widget);
g_signal_connect_swapped (widget, "changed", G_CALLBACK (changed_cb), sec);
gtk_entry_set_width_chars (GTK_ENTRY (widget), 28);
@@ -219,7 +219,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
if (connection)
update_secrets (WIRELESS_SECURITY (sec), connection);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_wpa"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_password_check"));
g_assert (widget);
g_signal_connect_swapped (widget, "toggled", G_CALLBACK (show_toggled_cb), sec);
@@ -227,11 +227,11 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
* supplicant when connecting to the AP.
*/
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_type_combo"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "type_combo"));
g_assert (widget);
gtk_widget_hide (widget);
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_type_label"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "type_label"));
g_assert (widget);
gtk_widget_hide (widget);
diff --git a/panels/network/wireless-security/ws-wpa-psk.ui b/panels/network/wireless-security/ws-wpa-psk.ui
index b398e1f7e..4fea601b4 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkGrid" id="wpa_psk_grid">
+ <object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="wpa_psk_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Password</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">wpa_psk_entry</property>
+ <property name="mnemonic_widget">password_entry</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -21,7 +21,7 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="wpa_psk_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@@ -35,13 +35,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="wpa_psk_type_label">
+ <object class="GtkLabel" id="type_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Type</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">wpa_psk_type_combo</property>
+ <property name="mnemonic_widget">type_combo</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -60,7 +60,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_checkbutton_wpa">
+ <object class="GtkCheckButton" id="show_password_check">
<property name="label" translatable="yes">Sho_w password</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -75,7 +75,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="wpa_psk_type_combo">
+ <object class="GtkComboBox" id="type_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
