From 879542d92b4d1697734ebae76ea3279c8ba47499 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 15 Oct 2019 15:19:35 +1300 Subject: [PATCH] network: Merge duplicate signal handlers --- panels/network/wireless-security/eap-method-peap.c | 2 +- panels/network/wireless-security/eap-method-tls.c | 2 +- panels/network/wireless-security/eap-method-ttls.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c index 9fa893a5e..818a8b880 100644 --- a/panels/network/wireless-security/eap-method-peap.c +++ b/panels/network/wireless-security/eap-method-peap.c @@ -88,6 +88,7 @@ ca_cert_not_required_toggled (EAPMethodPEAP *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"))); + wireless_security_notify_changed (self->sec_parent); } static void @@ -362,7 +363,6 @@ eap_method_peap_new (WirelessSecurity *ws_parent, widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_not_required_checkbox")); g_assert (widget); g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method); - g_signal_connect_swapped (widget, "toggled", G_CALLBACK (changed_cb), method); widget_ca_not_required_checkbox = widget; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button")); diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c index d8c771cd4..4c758bb64 100644 --- a/panels/network/wireless-security/eap-method-tls.c +++ b/panels/network/wireless-security/eap-method-tls.c @@ -128,6 +128,7 @@ ca_cert_not_required_toggled (EAPMethodTLS *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"))); + wireless_security_notify_changed (self->sec_parent); } static void @@ -465,7 +466,6 @@ eap_method_tls_new (WirelessSecurity *ws_parent, widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_ca_cert_not_required_checkbox")); g_assert (widget); g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method); - g_signal_connect_swapped (widget, "toggled", G_CALLBACK (changed_cb), method); widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry")); g_assert (widget); diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c index 05f655165..152aaac20 100644 --- a/panels/network/wireless-security/eap-method-ttls.c +++ b/panels/network/wireless-security/eap-method-ttls.c @@ -87,6 +87,7 @@ 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"))); + wireless_security_notify_changed (self->sec_parent); } static void @@ -416,7 +417,6 @@ eap_method_ttls_new (WirelessSecurity *ws_parent, widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_not_required_checkbox")); g_assert (widget); g_signal_connect_swapped (widget, "toggled", G_CALLBACK (ca_cert_not_required_toggled), method); - g_signal_connect_swapped (widget, "toggled", G_CALLBACK (changed_cb), method); widget_ca_not_required_checkbox = widget; widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));