[gnome-control-center/network-widget-references: 6/13] network: Remove unused virtual method



commit 007ee49963af57d0a1968e98ec42eabb758bcf35
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Oct 14 10:15:40 2019 +1300

    network: Remove unused virtual method

 panels/network/wireless-security/wireless-security.c | 15 ---------------
 panels/network/wireless-security/wireless-security.h |  5 -----
 panels/network/wireless-security/ws-dynamic-wep.c    |  7 -------
 panels/network/wireless-security/ws-leap.c           |  1 -
 panels/network/wireless-security/ws-wep-key.c        |  1 -
 panels/network/wireless-security/ws-wpa-eap.c        |  7 -------
 panels/network/wireless-security/ws-wpa-psk.c        |  1 -
 7 files changed, 37 deletions(-)
---
diff --git a/panels/network/wireless-security/wireless-security.c 
b/panels/network/wireless-security/wireless-security.c
index 541b990e4..15ceb2b54 100644
--- a/panels/network/wireless-security/wireless-security.c
+++ b/panels/network/wireless-security/wireless-security.c
@@ -43,7 +43,6 @@ struct _WirelessSecurityPrivate {
        WSAddToSizeGroupFunc add_to_size_group;
        WSFillConnectionFunc fill_connection;
        WSGetWidgetFunc get_widget;
-       WSUpdateSecretsFunc update_secrets;
        WSValidateFunc validate;
        WSDestroyFunc destroy;
 };
@@ -137,18 +136,6 @@ wireless_security_fill_connection (WirelessSecurity *sec,
        return (*(priv->fill_connection)) (sec, connection);
 }
 
-void
-wireless_security_update_secrets (WirelessSecurity *sec, NMConnection *connection)
-{
-       WirelessSecurityPrivate *priv = sec->priv;
-
-       g_return_if_fail (sec != NULL);
-       g_return_if_fail (connection != NULL);
-
-       if (priv->update_secrets)
-               priv->update_secrets (sec, connection);
-}
-
 WirelessSecurity *
 wireless_security_ref (WirelessSecurity *sec)
 {
@@ -193,7 +180,6 @@ wireless_security_init (gsize obj_size,
                         WSValidateFunc validate,
                         WSAddToSizeGroupFunc add_to_size_group,
                         WSFillConnectionFunc fill_connection,
-                        WSUpdateSecretsFunc update_secrets,
                         WSDestroyFunc destroy,
                         const char *ui_resource)
 {
@@ -217,7 +203,6 @@ wireless_security_init (gsize obj_size,
        priv->validate = validate;
        priv->add_to_size_group = add_to_size_group;
        priv->fill_connection = fill_connection;
-       priv->update_secrets = update_secrets;
 
        sec->builder = gtk_builder_new ();
        if (!gtk_builder_add_from_resource (sec->builder, ui_resource, &error)) {
diff --git a/panels/network/wireless-security/wireless-security.h 
b/panels/network/wireless-security/wireless-security.h
index e43fec7b3..0b219d7fe 100644
--- a/panels/network/wireless-security/wireless-security.h
+++ b/panels/network/wireless-security/wireless-security.h
@@ -34,7 +34,6 @@ typedef void (*WSChangedFunc) (WirelessSecurity *sec, gpointer user_data);
 
 typedef void (*WSAddToSizeGroupFunc)  (WirelessSecurity *sec, GtkSizeGroup *group);
 typedef void (*WSFillConnectionFunc)  (WirelessSecurity *sec, NMConnection *connection);
-typedef void (*WSUpdateSecretsFunc)   (WirelessSecurity *sec, NMConnection *connection);
 typedef void (*WSDestroyFunc)         (WirelessSecurity *sec);
 typedef gboolean (*WSValidateFunc)    (WirelessSecurity *sec, GError **error);
 typedef GtkWidget* (*WSGetWidgetFunc) (WirelessSecurity *sec);
@@ -61,9 +60,6 @@ void wireless_security_add_to_size_group (WirelessSecurity *sec,
 void wireless_security_fill_connection (WirelessSecurity *sec,
                                         NMConnection *connection);
 
-void wireless_security_update_secrets (WirelessSecurity *sec,
-                                       NMConnection *connection);
-
 void wireless_security_set_adhoc_compatible (WirelessSecurity *sec,
                                              gboolean adhoc_compatible);
 
@@ -109,7 +105,6 @@ WirelessSecurity *wireless_security_init (gsize obj_size,
                                           WSValidateFunc validate,
                                           WSAddToSizeGroupFunc add_to_size_group,
                                           WSFillConnectionFunc fill_connection,
-                                          WSUpdateSecretsFunc update_secrets,
                                           WSDestroyFunc destroy,
                                           const char *ui_resource);
 
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c 
b/panels/network/wireless-security/ws-dynamic-wep.c
index 8ea37ea12..532da7c71 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -94,12 +94,6 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
                                      sec->size_group);
 }
 
-static void
-update_secrets (WirelessSecurity *parent, NMConnection *connection)
-{
-       ws_802_1x_update_secrets (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, 
"dynamic_wep_auth_combo")), connection);
-}
-
 WirelessSecurityDynamicWEP *
 ws_dynamic_wep_new (NMConnection *connection,
                     gboolean is_editor,
@@ -112,7 +106,6 @@ ws_dynamic_wep_new (NMConnection *connection,
                                         validate,
                                         add_to_size_group,
                                         fill_connection,
-                                        update_secrets,
                                         destroy,
                                         "/org/gnome/ControlCenter/network/ws-dynamic-wep.ui");
        if (!parent)
diff --git a/panels/network/wireless-security/ws-leap.c b/panels/network/wireless-security/ws-leap.c
index d2348b279..414caedf3 100644
--- a/panels/network/wireless-security/ws-leap.c
+++ b/panels/network/wireless-security/ws-leap.c
@@ -158,7 +158,6 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
                                         validate,
                                         add_to_size_group,
                                         fill_connection,
-                                        update_secrets,
                                         NULL,
                                         "/org/gnome/ControlCenter/network/ws-leap.ui");
        if (!parent)
diff --git a/panels/network/wireless-security/ws-wep-key.c b/panels/network/wireless-security/ws-wep-key.c
index 507ea6bf8..53a6a0f86 100644
--- a/panels/network/wireless-security/ws-wep-key.c
+++ b/panels/network/wireless-security/ws-wep-key.c
@@ -269,7 +269,6 @@ ws_wep_key_new (NMConnection *connection,
                                         validate,
                                         add_to_size_group,
                                         fill_connection,
-                                        update_secrets,
                                         destroy,
                                         "/org/gnome/ControlCenter/network/ws-wep-key.ui");
        if (!parent)
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index a32418c5b..05bf1322b 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -95,12 +95,6 @@ auth_combo_changed_cb (GtkWidget *combo, gpointer user_data)
                                      sec->size_group);
 }
 
-static void
-update_secrets (WirelessSecurity *parent, NMConnection *connection)
-{
-       ws_802_1x_update_secrets (GTK_COMBO_BOX (gtk_builder_get_object (parent->builder, 
"wpa_eap_auth_combo")), connection);
-}
-
 WirelessSecurityWPAEAP *
 ws_wpa_eap_new (NMConnection *connection,
                 gboolean is_editor,
@@ -113,7 +107,6 @@ ws_wpa_eap_new (NMConnection *connection,
                                         validate,
                                         add_to_size_group,
                                         fill_connection,
-                                        update_secrets,
                                         destroy,
                                         "/org/gnome/ControlCenter/network/ws-wpa-eap.ui");
        if (!parent)
diff --git a/panels/network/wireless-security/ws-wpa-psk.c b/panels/network/wireless-security/ws-wpa-psk.c
index 82c3177e6..3999b108b 100644
--- a/panels/network/wireless-security/ws-wpa-psk.c
+++ b/panels/network/wireless-security/ws-wpa-psk.c
@@ -186,7 +186,6 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
                                         validate,
                                         add_to_size_group,
                                         fill_connection,
-                                        update_secrets,
                                         NULL,
                                         "/org/gnome/ControlCenter/network/ws-wpa-psk.ui");
        if (!parent)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]