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

network: Simplify helper functions

Browse source
This commit is contained in:
Robert Ancell 2019-11-08 16:17:58 +13:00 • committed by Georges Basile Stavracas Neto
parent 69a5b8750b
commit 08b26a93a7
4 changed files with 13 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
panels/network/wireless-security/wireless-security.c
View file

@ -360,12 +360,12 @@ wireless_security_clear_ciphers (NMConnection *connection)
nm_setting_wireless_security_clear_groups (s_wireless_sec);
}
static EAPMethod *
get_active_method (GtkComboBox *combo)
EAPMethod *
ws_802_1x_auth_combo_get_eap (GtkComboBox *combo)
{
GtkTreeModel *model;
GtkTreeIter iter;
EAPMethod *eap;
g_autoptr(EAPMethod) eap = NULL;
model = gtk_combo_box_get_model (combo);
if (!gtk_combo_box_get_active_iter (combo, &iter))
@ -375,36 +375,13 @@ get_active_method (GtkComboBox *combo)
return eap;
}
void
ws_802_1x_add_to_size_group (GtkSizeGroup *size_group,
GtkComboBox *combo)
{
g_autoptr(EAPMethod) eap = NULL;
eap = get_active_method (combo);
g_assert (eap);
eap_method_add_to_size_group (eap, size_group);
}
gboolean
ws_802_1x_validate (GtkComboBox *combo, GError **error)
{
g_autoptr(EAPMethod) eap = NULL;
gboolean valid = FALSE;
eap = get_active_method (combo);
g_assert (eap);
valid = eap_method_validate (eap, error);
return valid;
}
void
ws_802_1x_auth_combo_changed (GtkComboBox *combo,
WirelessSecurity *self,
GtkBox *vbox,
GtkSizeGroup *size_group)
{
g_autoptr(EAPMethod) eap = NULL;
EAPMethod *eap;
GList *elt, *children;
GtkWidget *eap_widget;
GtkWidget *eap_default_widget = NULL;
@ -414,7 +391,7 @@ ws_802_1x_auth_combo_changed (GtkComboBox *combo,
for (elt = children; elt; elt = g_list_next (elt))
gtk_container_remove (GTK_CONTAINER (vbox), GTK_WIDGET (elt->data));
eap = get_active_method (GTK_COMBO_BOX (combo));
eap = ws_802_1x_auth_combo_get_eap (GTK_COMBO_BOX (combo));
g_assert (eap);
eap_widget = eap_method_get_widget (eap);
@ -570,10 +547,10 @@ ws_802_1x_fill_connection (GtkComboBox *combo,
NMSettingWirelessSecurity *s_wireless_sec;
NMSetting8021x *s_8021x;
NMSettingSecretFlags secret_flags = NM_SETTING_SECRET_FLAG_NONE;
g_autoptr(EAPMethod) eap = NULL;
EAPMethod *eap;
/* Get the EAPMethod object */
eap = get_active_method (combo);
eap = ws_802_1x_auth_combo_get_eap (combo);
g_assert (eap);
/* Get previous pasword flags, if any. Otherwise default to agent-owned secrets */

5
panels/network/wireless-security/wireless-security.h
View file

@ -120,10 +120,9 @@ void ws_802_1x_auth_combo_changed (GtkComboBox *combo,
GtkBox *vbox,
GtkSizeGroup *size_group);
gboolean ws_802_1x_validate (GtkComboBox *combo, GError **error);
#include "eap-method.h"
void ws_802_1x_add_to_size_group (GtkSizeGroup *size_group,
GtkComboBox *combo);
EAPMethod *ws_802_1x_auth_combo_get_eap (GtkComboBox *combo);
void ws_802_1x_fill_connection (GtkComboBox *combo,
NMConnection *connection);

4
panels/network/wireless-security/ws-dynamic-wep.c
View file

@ -59,7 +59,7 @@ static gboolean
validate (WirelessSecurity *parent, GError **error)
{
WirelessSecurityDynamicWEP *self = (WirelessSecurityDynamicWEP *) parent;
return ws_802_1x_validate (self->auth_combo, error);
return eap_method_validate (ws_802_1x_auth_combo_get_eap (self->auth_combo), error);
}
static void
@ -71,7 +71,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
self->size_group = g_object_ref (group);
gtk_size_group_add_widget (self->size_group, GTK_WIDGET (self->auth_label));
ws_802_1x_add_to_size_group (self->size_group, self->auth_combo);
eap_method_add_to_size_group (ws_802_1x_auth_combo_get_eap (self->auth_combo), self->size_group);
}
static void

4
panels/network/wireless-security/ws-wpa-eap.c
View file

@ -60,7 +60,7 @@ static gboolean
validate (WirelessSecurity *parent, GError **error)
{
WirelessSecurityWPAEAP *self = (WirelessSecurityWPAEAP *) parent;
return ws_802_1x_validate (self->auth_combo, error);
return eap_method_validate (ws_802_1x_auth_combo_get_eap (self->auth_combo), error);
}
static void
@ -72,7 +72,7 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
self->size_group = g_object_ref (group);
gtk_size_group_add_widget (self->size_group, GTK_WIDGET (self->auth_label));
ws_802_1x_add_to_size_group (self->size_group, self->auth_combo);
eap_method_add_to_size_group (ws_802_1x_auth_combo_get_eap (self->auth_combo), self->size_group);
}
static void