[gnome-control-center] network: Remove unused parameter
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Remove unused parameter
- Date: Fri, 31 Jan 2020 14:18:39 +0000 (UTC)
commit 7f4eaf5eec74852590165b338ae3a793af87d6df
Author: Robert Ancell <robert ancell canonical com>
Date: Mon Dec 2 15:57:54 2019 +1300
network: Remove unused parameter
panels/network/wireless-security/eap-method-tls.c | 11 ++++-------
panels/network/wireless-security/eap-method-tls.h | 5 +----
panels/network/wireless-security/ws-dynamic-wep.c | 2 +-
panels/network/wireless-security/ws-wpa-eap.c | 2 +-
4 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/panels/network/wireless-security/eap-method-tls.c
b/panels/network/wireless-security/eap-method-tls.c
index fadd6e066..96083d632 100644
--- a/panels/network/wireless-security/eap-method-tls.c
+++ b/panels/network/wireless-security/eap-method-tls.c
@@ -27,7 +27,6 @@
#include "helpers.h"
#include "nma-ui-utils.h"
#include "ui-helpers.h"
-#include "wireless-security.h"
struct _EAPMethodTLS {
GtkGrid parent;
@@ -318,7 +317,6 @@ static void
setup_filepicker (EAPMethodTLS *self,
GtkFileChooserButton *button,
const char *title,
- WirelessSecurity *ws_parent,
NMSetting8021x *s_8021x,
SchemeFunc scheme_func,
PathFunc path_func,
@@ -459,8 +457,7 @@ eap_method_iface_init (EAPMethodInterface *iface)
}
EAPMethodTLS *
-eap_method_tls_new (WirelessSecurity *ws_parent,
- NMConnection *connection,
+eap_method_tls_new (NMConnection *connection,
gboolean phase2,
gboolean secrets_only)
{
@@ -487,21 +484,21 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
setup_filepicker (self,
self->user_cert_button,
_("Choose your personal certificate"),
- ws_parent, s_8021x,
+ 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 (self,
self->ca_cert_button,
_("Choose a Certificate Authority certificate"),
- ws_parent, s_8021x,
+ 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 (self,
self->private_key_button,
_("Choose your private key"),
- ws_parent, s_8021x,
+ s_8021x,
phase2 ? nm_setting_802_1x_get_phase2_private_key_scheme :
nm_setting_802_1x_get_private_key_scheme,
phase2 ? nm_setting_802_1x_get_phase2_private_key_path :
nm_setting_802_1x_get_private_key_path,
TRUE, FALSE);
diff --git a/panels/network/wireless-security/eap-method-tls.h
b/panels/network/wireless-security/eap-method-tls.h
index fff224565..9b6d0f8a4 100644
--- a/panels/network/wireless-security/eap-method-tls.h
+++ b/panels/network/wireless-security/eap-method-tls.h
@@ -25,14 +25,11 @@
#include <gtk/gtk.h>
#include <NetworkManager.h>
-#include "wireless-security.h"
-
G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (EAPMethodTLS, eap_method_tls, EAP, METHOD_TLS, GtkGrid)
-EAPMethodTLS *eap_method_tls_new (WirelessSecurity *ws_parent,
- NMConnection *connection,
+EAPMethodTLS *eap_method_tls_new (NMConnection *connection,
gboolean phase2,
gboolean secrets_only);
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c
b/panels/network/wireless-security/ws-dynamic-wep.c
index 0c4c99930..b78da7e5f 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -262,7 +262,7 @@ ws_dynamic_wep_new (NMConnection *connection,
if (secrets_only)
simple_flags |= EAP_METHOD_SIMPLE_FLAG_SECRETS_ONLY;
- self->em_tls = eap_method_tls_new (WIRELESS_SECURITY (self), connection, FALSE, secrets_only);
+ self->em_tls = eap_method_tls_new (connection, FALSE, secrets_only);
gtk_widget_show (GTK_WIDGET (self->em_tls));
g_signal_connect_object (self->em_tls, "changed", G_CALLBACK (wireless_security_notify_changed),
self, G_CONNECT_SWAPPED);
self->em_leap = eap_method_leap_new (WIRELESS_SECURITY (self), connection, secrets_only);
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index aecd5a291..b8a9f0356 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -298,7 +298,7 @@ ws_wpa_eap_new (NMConnection *connection,
self->em_md5 = eap_method_simple_new (WIRELESS_SECURITY (self), connection,
EAP_METHOD_SIMPLE_TYPE_MD5, simple_flags);
gtk_widget_show (GTK_WIDGET (self->em_md5));
g_signal_connect_object (self->em_md5, "changed", G_CALLBACK (wireless_security_notify_changed),
self, G_CONNECT_SWAPPED);
- self->em_tls = eap_method_tls_new (WIRELESS_SECURITY (self), connection, FALSE, secrets_only);
+ self->em_tls = eap_method_tls_new (connection, FALSE, secrets_only);
gtk_widget_show (GTK_WIDGET (self->em_tls));
g_signal_connect_object (self->em_tls, "changed", G_CALLBACK (wireless_security_notify_changed),
self, G_CONNECT_SWAPPED);
self->em_leap = eap_method_leap_new (WIRELESS_SECURITY (self), connection, secrets_only);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]