diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2019-11-12 09:43:41 +1300 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-11-27 22:05:46 +0000 |
| commit | 8bcc2f811a49d5b3acc331f7325b57231851a3fe (patch) | |
| tree | 21eba551dbfe76bc7ec8e074fb17f59aea9b9663 /panels/network | |
| parent | f75affbfe05f8f9a1c2e1031749c544a4d526d01 (diff) | |
| download | gnome-control-center-8bcc2f811a49d5b3acc331f7325b57231851a3fe.tar.gz | |
network: Move helper function with other helper code
Diffstat (limited to 'panels/network')
| -rw-r--r-- | panels/network/wireless-security/helpers.c | 14 | ||||
| -rw-r--r-- | panels/network/wireless-security/helpers.h | 2 | ||||
| -rw-r--r-- | panels/network/wireless-security/wireless-security.c | 15 | ||||
| -rw-r--r-- | panels/network/wireless-security/wireless-security.h | 4 |
4 files changed, 16 insertions, 19 deletions
diff --git a/panels/network/wireless-security/helpers.c b/panels/network/wireless-security/helpers.c index 083c66ffb..23d8678dd 100644 --- a/panels/network/wireless-security/helpers.c +++ b/panels/network/wireless-security/helpers.c @@ -46,3 +46,17 @@ helper_fill_secret_entry (NMConnection *connection, } } +void +wireless_security_clear_ciphers (NMConnection *connection) +{ + NMSettingWirelessSecurity *s_wireless_sec; + + g_return_if_fail (connection != NULL); + + s_wireless_sec = nm_connection_get_setting_wireless_security (connection); + g_assert (s_wireless_sec); + + nm_setting_wireless_security_clear_protos (s_wireless_sec); + nm_setting_wireless_security_clear_pairwise (s_wireless_sec); + nm_setting_wireless_security_clear_groups (s_wireless_sec); +} diff --git a/panels/network/wireless-security/helpers.h b/panels/network/wireless-security/helpers.h index 43a8cd6ff..24c12ff69 100644 --- a/panels/network/wireless-security/helpers.h +++ b/panels/network/wireless-security/helpers.h @@ -30,5 +30,7 @@ void helper_fill_secret_entry (NMConnection *connection, GType setting_type, HelperSecretFunc func); +void wireless_security_clear_ciphers (NMConnection *connection); + #endif /* _HELPERS_H_ */ diff --git a/panels/network/wireless-security/wireless-security.c b/panels/network/wireless-security/wireless-security.c index 47a92605b..1386c2195 100644 --- a/panels/network/wireless-security/wireless-security.c +++ b/panels/network/wireless-security/wireless-security.c @@ -222,18 +222,3 @@ wireless_security_get_show_password (WirelessSecurity *self) return priv->show_password; } - -void -wireless_security_clear_ciphers (NMConnection *connection) -{ - NMSettingWirelessSecurity *s_wireless_sec; - - g_return_if_fail (connection != NULL); - - s_wireless_sec = nm_connection_get_setting_wireless_security (connection); - g_assert (s_wireless_sec); - - nm_setting_wireless_security_clear_protos (s_wireless_sec); - nm_setting_wireless_security_clear_pairwise (s_wireless_sec); - nm_setting_wireless_security_clear_groups (s_wireless_sec); -} diff --git a/panels/network/wireless-security/wireless-security.h b/panels/network/wireless-security/wireless-security.h index 501ec611e..1c3f0159d 100644 --- a/panels/network/wireless-security/wireless-security.h +++ b/panels/network/wireless-security/wireless-security.h @@ -66,10 +66,6 @@ void wireless_security_set_show_password (WirelessSecurity *sec, gboolean show_p gboolean wireless_security_get_show_password (WirelessSecurity *sec); -/* Below for internal use only */ - void wireless_security_notify_changed (WirelessSecurity *sec); -void wireless_security_clear_ciphers (NMConnection *connection); - G_END_DECLS |