[gnome-control-center/network-widget-references: 12/13] network: Rename widget IDs to standard names
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/network-widget-references: 12/13] network: Rename widget IDs to standard names
- Date: Tue, 15 Oct 2019 03:41:08 +0000 (UTC)
commit c454b90cc0defe91c4b4aed3f0a2f17f22a1ea45
Author: Robert Ancell <robert ancell canonical com>
Date: Tue Oct 15 12:34:44 2019 +1300
network: Rename widget IDs to standard names
Drop unused IDs
Remove prefixes
.../connection-editor/ce-page-8021x-security.c | 2 +-
panels/network/wireless-security/eap-method-fast.c | 66 +++++++--------
.../network/wireless-security/eap-method-fast.ui | 40 ++++-----
panels/network/wireless-security/eap-method-leap.c | 24 +++---
.../network/wireless-security/eap-method-leap.ui | 18 ++--
panels/network/wireless-security/eap-method-peap.c | 80 +++++++++---------
.../network/wireless-security/eap-method-peap.ui | 44 +++++-----
.../network/wireless-security/eap-method-simple.c | 24 +++---
.../network/wireless-security/eap-method-simple.ui | 20 ++---
panels/network/wireless-security/eap-method-tls.c | 98 +++++++++++-----------
panels/network/wireless-security/eap-method-tls.ui | 38 ++++-----
panels/network/wireless-security/eap-method-ttls.c | 80 +++++++++---------
.../network/wireless-security/eap-method-ttls.ui | 38 ++++-----
panels/network/wireless-security/ws-dynamic-wep.c | 18 ++--
panels/network/wireless-security/ws-dynamic-wep.ui | 18 ++--
panels/network/wireless-security/ws-leap.c | 26 +++---
panels/network/wireless-security/ws-leap.ui | 18 ++--
panels/network/wireless-security/ws-wep-key.c | 22 ++---
panels/network/wireless-security/ws-wep-key.ui | 26 +++---
panels/network/wireless-security/ws-wpa-eap.c | 18 ++--
panels/network/wireless-security/ws-wpa-eap.ui | 18 ++--
panels/network/wireless-security/ws-wpa-psk.c | 24 +++---
panels/network/wireless-security/ws-wpa-psk.ui | 20 ++---
23 files changed, 390 insertions(+), 390 deletions(-)
---
diff --git a/panels/network/connection-editor/ce-page-8021x-security.c
b/panels/network/connection-editor/ce-page-8021x-security.c
index 764041876..960949797 100644
--- a/panels/network/connection-editor/ce-page-8021x-security.c
+++ b/panels/network/connection-editor/ce-page-8021x-security.c
@@ -139,7 +139,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/wireless-security/eap-method-fast.c
b/panels/network/wireless-security/eap-method-fast.c
index 49238c54e..52715ffa6 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_notebook",
- "eap_fast_anon_identity_entry",
+ "notebook",
+ "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 784f19150..efcdf8e68 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,13 +29,13 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="eap_fast_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table13">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">5</property>
@@ -43,13 +43,13 @@
<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="x_options">GTK_FILL</property>
@@ -57,7 +57,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="activates_default">True</property>
@@ -69,13 +69,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="top_attach">2</property>
@@ -85,7 +85,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>
</object>
@@ -99,7 +99,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>
@@ -115,13 +115,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="top_attach">3</property>
@@ -131,12 +131,12 @@
</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="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>
@@ -152,7 +152,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>
@@ -168,12 +168,12 @@
</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="model">model9</property>
+ <property name="model">pac_provision_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer9"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
diff --git a/panels/network/wireless-security/eap-method-leap.c
b/panels/network/wireless-security/eap-method-leap.c
index 7f379c73b..e449ae7de 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_notebook"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
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_notebook",
- "eap_leap_username_entry",
+ "notebook",
+ "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_notebook"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
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 ffcd71245..bf140a8f8 100644
--- a/panels/network/wireless-security/eap-method-leap.ui
+++ b/panels/network/wireless-security/eap-method-leap.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkNotebook" id="eap_leap_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table9">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -19,13 +19,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="x_options">GTK_FILL</property>
@@ -33,13 +33,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="top_attach">1</property>
@@ -49,7 +49,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="visibility">False</property>
@@ -64,7 +64,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>
@@ -82,7 +82,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>
</object>
diff --git a/panels/network/wireless-security/eap-method-peap.c
b/panels/network/wireless-security/eap-method-peap.c
index 70774a1a2..ae6409566 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_notebook",
- "eap_peap_anon_identity_entry",
+ "notebook",
+ "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 3ad70c250..dbcc57d93 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,25 +29,25 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="eap_peap_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkGrid" id="eap_peap_grid">
+ <object class="GtkGrid">
<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>
@@ -55,7 +55,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>
@@ -67,13 +67,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>
@@ -81,7 +81,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>
@@ -92,7 +92,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>
@@ -107,13 +107,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>
@@ -121,13 +121,13 @@
</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" id="renderer9"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -139,13 +139,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>
@@ -153,13 +153,13 @@
</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" id="renderer8"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -171,7 +171,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 51e21fb57..d7aeb7346 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_notebook"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
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_notebook",
- "eap_simple_username_entry",
+ "notebook",
+ "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_notebook"));
+ widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
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 f73fd0d6d..b130dbbf8 100644
--- a/panels/network/wireless-security/eap-method-simple.ui
+++ b/panels/network/wireless-security/eap-method-simple.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkNotebook" id="eap_simple_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table11">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -19,13 +19,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="x_options">GTK_FILL</property>
@@ -33,13 +33,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="top_attach">1</property>
@@ -49,7 +49,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="visibility">False</property>
@@ -64,7 +64,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="activates_default">True</property>
@@ -76,12 +76,12 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox5">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</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 704baa01a..152a59cd5 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_notebook",
- "eap_tls_identity_entry",
+ "notebook",
+ "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 389f399ff..319cc4847 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkNotebook" id="eap_tls_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkGrid" id="eap_tls_grid">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -17,13 +17,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>
@@ -31,7 +31,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>
@@ -43,13 +43,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>
@@ -57,7 +57,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>
@@ -68,13 +68,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>
@@ -82,7 +82,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>
@@ -93,7 +93,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>
@@ -108,13 +108,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>
@@ -122,7 +122,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>
@@ -133,13 +133,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>
@@ -147,7 +147,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>
@@ -160,7 +160,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 e75b3fb2d..871a237cb 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_notebook",
- "eap_ttls_anon_identity_entry",
+ "notebook",
+ "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 155bdae5f..a1c51c417 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,25 +12,25 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="eap_ttls_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkGrid" id="eap_ttls_grid">
+ <object class="GtkGrid">
<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>
@@ -38,7 +38,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>
@@ -50,12 +50,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>
@@ -64,7 +64,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>
@@ -76,12 +76,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>
@@ -90,7 +90,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>
@@ -101,7 +101,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>
@@ -117,12 +117,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>
@@ -131,13 +131,13 @@
</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" id="renderer6"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -149,7 +149,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 ca5f6223d..6d281af34 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_notebook"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
}
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 9f151a9c0..3913e7f3f 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,13 +12,13 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="dynamic_wep_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table12">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
@@ -32,13 +32,13 @@
<placeholder/>
</child>
<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="x_options">GTK_FILL</property>
@@ -46,12 +46,12 @@
</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="model">model7</property>
+ <property name="model">auth_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer7"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -64,7 +64,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 eafef7d85..827c7d0bb 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_notebook"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
}
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 b019af847..3ee483dcc 100644
--- a/panels/network/wireless-security/ws-leap.ui
+++ b/panels/network/wireless-security/ws-leap.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkNotebook" id="leap_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
@@ -19,13 +19,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="x_options">GTK_FILL</property>
@@ -33,13 +33,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="top_attach">1</property>
@@ -49,7 +49,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="visibility">False</property>
@@ -64,7 +64,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>
@@ -82,7 +82,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="activates_default">True</property>
diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c
index 74d1f1c6d..867cd9c58 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_notebook"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
}
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 24a1e0801..72fabb78a 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,13 +35,13 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="wep_key_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">4</property>
@@ -49,13 +49,13 @@
<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="x_options">GTK_FILL</property>
@@ -63,7 +63,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="max_length">64</property>
@@ -77,7 +77,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label31">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -90,7 +90,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>
@@ -127,9 +127,9 @@
<object class="GtkComboBox" id="auth_method_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">model3</property>
+ <property name="model">auth_method_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer3"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -164,9 +164,9 @@
<object class="GtkComboBox" id="key_index_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">model4</property>
+ <property name="model">key_index_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer4"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index 6b4843451..3cf524030 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_notebook"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
}
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 96656206f..cf22cdc8a 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,13 +12,13 @@
</row>
</data>
</object>
- <object class="GtkNotebook" id="wpa_eap_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="wpa_eap_table">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -26,13 +26,13 @@
<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="x_options">GTK_FILL</property>
@@ -40,12 +40,12 @@
</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="model">model5</property>
+ <property name="model">auth_model</property>
<child>
- <object class="GtkCellRendererText" id="renderer5"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -58,7 +58,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 ca9c146f9..8cdc68785 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_notebook"));
+ return GTK_WIDGET (gtk_builder_get_object (parent->builder, "notebook"));
}
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 7db86fe1b..0d4723f9b 100644
--- a/panels/network/wireless-security/ws-wpa-psk.ui
+++ b/panels/network/wireless-security/ws-wpa-psk.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="3.4"/>
- <object class="GtkNotebook" id="wpa_psk_notebook">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
- <object class="GtkTable" id="wpa_psk_table">
+ <object class="GtkTable">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
@@ -15,13 +15,13 @@
<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="x_options">GTK_FILL</property>
@@ -29,7 +29,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="max_length">64</property>
@@ -43,13 +43,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="top_attach">2</property>
@@ -59,7 +59,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label32">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -72,7 +72,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>
@@ -90,7 +90,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>
</object>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
