From 413f23ec9928b96fdf2b39f6d06d6f687513a6df Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 6 Nov 2019 16:33:07 +1300 Subject: [PATCH] network: Rename virtual method to standard names --- .../ce-page-8021x-security.c | 4 +-- .../connection-editor/ce-page-ethernet.c | 10 +++---- .../network/connection-editor/ce-page-ip4.c | 10 +++---- .../network/connection-editor/ce-page-ip6.c | 10 +++---- .../connection-editor/ce-page-security.c | 30 +++++++++---------- .../network/connection-editor/ce-page-vpn.c | 30 +++++++++---------- .../network/connection-editor/ce-page-wifi.c | 8 ++--- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/panels/network/connection-editor/ce-page-8021x-security.c b/panels/network/connection-editor/ce-page-8021x-security.c index 9a4e0c2b2..fec879206 100644 --- a/panels/network/connection-editor/ce-page-8021x-security.c +++ b/panels/network/connection-editor/ce-page-8021x-security.c @@ -110,7 +110,7 @@ ce_page_8021x_security_new (NMConnection *connection, } static gboolean -validate (CEPage *cepage, NMConnection *connection, GError **error) +ce_page_8021x_security_validate (CEPage *cepage, NMConnection *connection, GError **error) { CEPage8021xSecurity *self = CE_PAGE_8021X_SECURITY (cepage); gboolean valid = TRUE; @@ -176,5 +176,5 @@ ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class) /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->validate = ce_page_8021x_security_validate; } diff --git a/panels/network/connection-editor/ce-page-ethernet.c b/panels/network/connection-editor/ce-page-ethernet.c index e53800797..b56335511 100644 --- a/panels/network/connection-editor/ce-page-ethernet.c +++ b/panels/network/connection-editor/ce-page-ethernet.c @@ -125,9 +125,9 @@ ui_to_setting (CEPageEthernet *self) } static gboolean -validate (CEPage *page, - NMConnection *connection, - GError **error) +ce_page_ethernet_validate (CEPage *page, + NMConnection *connection, + GError **error) { CEPageEthernet *self = CE_PAGE_ETHERNET (page); GtkWidget *entry; @@ -169,9 +169,9 @@ ce_page_ethernet_init (CEPageEthernet *self) static void ce_page_ethernet_class_init (CEPageEthernetClass *class) { - CEPageClass *page_class= CE_PAGE_CLASS (class); + CEPageClass *page_class = CE_PAGE_CLASS (class); - page_class->validate = validate; + page_class->validate = ce_page_ethernet_validate; } CEPage * diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c index 6f774404d..ea4017e06 100644 --- a/panels/network/connection-editor/ce-page-ip4.c +++ b/panels/network/connection-editor/ce-page-ip4.c @@ -836,9 +836,9 @@ out: } static gboolean -validate (CEPage *self, - NMConnection *connection, - GError **error) +ce_page_ip4_validate (CEPage *self, + NMConnection *connection, + GError **error) { if (!ui_to_setting (CE_PAGE_IP4 (self))) return FALSE; @@ -854,9 +854,9 @@ ce_page_ip4_init (CEPageIP4 *self) static void ce_page_ip4_class_init (CEPageIP4Class *class) { - CEPageClass *page_class= CE_PAGE_CLASS (class); + CEPageClass *page_class = CE_PAGE_CLASS (class); - page_class->validate = validate; + page_class->validate = ce_page_ip4_validate; } CEPage * diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c index 95e063a2f..ef9381b2b 100644 --- a/panels/network/connection-editor/ce-page-ip6.c +++ b/panels/network/connection-editor/ce-page-ip6.c @@ -758,9 +758,9 @@ out: } static gboolean -validate (CEPage *self, - NMConnection *connection, - GError **error) +ce_page_ip6_validate (CEPage *self, + NMConnection *connection, + GError **error) { if (!ui_to_setting (CE_PAGE_IP6 (self))) return FALSE; @@ -776,9 +776,9 @@ ce_page_ip6_init (CEPageIP6 *self) static void ce_page_ip6_class_init (CEPageIP6Class *class) { - CEPageClass *page_class= CE_PAGE_CLASS (class); + CEPageClass *page_class = CE_PAGE_CLASS (class); - page_class->validate = validate; + page_class->validate = ce_page_ip6_validate; } CEPage * diff --git a/panels/network/connection-editor/ce-page-security.c b/panels/network/connection-editor/ce-page-security.c index 5582dc3a2..a215d9e85 100644 --- a/panels/network/connection-editor/ce-page-security.c +++ b/panels/network/connection-editor/ce-page-security.c @@ -351,10 +351,20 @@ finish_setup (CEPageSecurity *self) G_CALLBACK (security_combo_changed), self); } +static void +ce_page_security_dispose (GObject *object) +{ + CEPageSecurity *self = CE_PAGE_SECURITY (object); + + g_clear_object (&self->group); + + G_OBJECT_CLASS (ce_page_security_parent_class)->dispose (object); +} + static gboolean -validate (CEPage *page, - NMConnection *connection, - GError **error) +ce_page_security_validate (CEPage *page, + NMConnection *connection, + GError **error) { CEPageSecurity *self = CE_PAGE_SECURITY (page); NMSettingWireless *sw; @@ -406,24 +416,14 @@ ce_page_security_init (CEPageSecurity *self) { } -static void -dispose (GObject *object) -{ - CEPageSecurity *self = CE_PAGE_SECURITY (object); - - g_clear_object (&self->group); - - G_OBJECT_CLASS (ce_page_security_parent_class)->dispose (object); -} - static void ce_page_security_class_init (CEPageSecurityClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); CEPageClass *page_class = CE_PAGE_CLASS (class); - object_class->dispose = dispose; - page_class->validate = validate; + object_class->dispose = ce_page_security_dispose; + page_class->validate = ce_page_security_validate; } CEPage * diff --git a/panels/network/connection-editor/ce-page-vpn.c b/panels/network/connection-editor/ce-page-vpn.c index f9ba9529e..adc7ec906 100644 --- a/panels/network/connection-editor/ce-page-vpn.c +++ b/panels/network/connection-editor/ce-page-vpn.c @@ -109,10 +109,20 @@ connect_vpn_page (CEPageVpn *self) g_signal_connect_swapped (self->name_entry, "changed", G_CALLBACK (ce_page_changed), self); } +static void +ce_page_vpn_dispose (GObject *object) +{ + CEPageVpn *self = CE_PAGE_VPN (object); + + g_clear_object (&self->editor); + + G_OBJECT_CLASS (ce_page_vpn_parent_class)->dispose (object); +} + static gboolean -validate (CEPage *page, - NMConnection *connection, - GError **error) +ce_page_vpn_validate (CEPage *page, + NMConnection *connection, + GError **error) { CEPageVpn *self = CE_PAGE_VPN (page); @@ -134,25 +144,15 @@ ce_page_vpn_init (CEPageVpn *self) { } -static void -dispose (GObject *object) -{ - CEPageVpn *self = CE_PAGE_VPN (object); - - g_clear_object (&self->editor); - - G_OBJECT_CLASS (ce_page_vpn_parent_class)->dispose (object); -} - static void ce_page_vpn_class_init (CEPageVpnClass *class) { CEPageClass *page_class = CE_PAGE_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->dispose = dispose; + object_class->dispose = ce_page_vpn_dispose; - page_class->validate = validate; + page_class->validate = ce_page_vpn_validate; } static void diff --git a/panels/network/connection-editor/ce-page-wifi.c b/panels/network/connection-editor/ce-page-wifi.c index a771cad51..7f7050597 100644 --- a/panels/network/connection-editor/ce-page-wifi.c +++ b/panels/network/connection-editor/ce-page-wifi.c @@ -110,9 +110,9 @@ ui_to_setting (CEPageWifi *self) } static gboolean -validate (CEPage *parent, - NMConnection *connection, - GError **error) +ce_page_wifi_class_validate (CEPage *parent, + NMConnection *connection, + GError **error) { CEPageWifi *self = (CEPageWifi *) parent; GtkWidget *entry; @@ -159,7 +159,7 @@ ce_page_wifi_class_init (CEPageWifiClass *class) { CEPageClass *page_class= CE_PAGE_CLASS (class); - page_class->validate = validate; + page_class->validate = ce_page_wifi_class_validate; } CEPage *