applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Rename virtual method to standard names

Browse source
This commit is contained in:
Robert Ancell 2019-11-06 16:33:07 +13:00
parent f335ed420f
commit 413f23ec99
7 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
panels/network/connection-editor/ce-page-8021x-security.c
View file

@ -110,7 +110,7 @@ ce_page_8021x_security_new (NMConnection *connection,
} }
static gboolean 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); CEPage8021xSecurity *self = CE_PAGE_8021X_SECURITY (cepage);
gboolean valid = TRUE; gboolean valid = TRUE;
@ -176,5 +176,5 @@ ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class)
/* virtual methods */ /* virtual methods */
object_class->dispose = dispose; object_class->dispose = dispose;
parent_class->validate = validate; parent_class->validate = ce_page_8021x_security_validate;
} }

10
panels/network/connection-editor/ce-page-ethernet.c
View file

@ -125,9 +125,9 @@ ui_to_setting (CEPageEthernet *self)
} }
static gboolean static gboolean
validate (CEPage *page, ce_page_ethernet_validate (CEPage *page,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
CEPageEthernet *self = CE_PAGE_ETHERNET (page); CEPageEthernet *self = CE_PAGE_ETHERNET (page);
GtkWidget *entry; GtkWidget *entry;
@ -169,9 +169,9 @@ ce_page_ethernet_init (CEPageEthernet *self)
static void static void
ce_page_ethernet_class_init (CEPageEthernetClass *class) 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 * CEPage *

10
panels/network/connection-editor/ce-page-ip4.c
View file

@ -836,9 +836,9 @@ out:
} }
static gboolean static gboolean
validate (CEPage *self, ce_page_ip4_validate (CEPage *self,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
if (!ui_to_setting (CE_PAGE_IP4 (self))) if (!ui_to_setting (CE_PAGE_IP4 (self)))
return FALSE; return FALSE;
@ -854,9 +854,9 @@ ce_page_ip4_init (CEPageIP4 *self)
static void static void
ce_page_ip4_class_init (CEPageIP4Class *class) 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 * CEPage *

10
panels/network/connection-editor/ce-page-ip6.c
View file

@ -758,9 +758,9 @@ out:
} }
static gboolean static gboolean
validate (CEPage *self, ce_page_ip6_validate (CEPage *self,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
if (!ui_to_setting (CE_PAGE_IP6 (self))) if (!ui_to_setting (CE_PAGE_IP6 (self)))
return FALSE; return FALSE;
@ -776,9 +776,9 @@ ce_page_ip6_init (CEPageIP6 *self)
static void static void
ce_page_ip6_class_init (CEPageIP6Class *class) 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 * CEPage *

30
panels/network/connection-editor/ce-page-security.c
View file

@ -351,10 +351,20 @@ finish_setup (CEPageSecurity *self)
G_CALLBACK (security_combo_changed), 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 static gboolean
validate (CEPage *page, ce_page_security_validate (CEPage *page,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
CEPageSecurity *self = CE_PAGE_SECURITY (page); CEPageSecurity *self = CE_PAGE_SECURITY (page);
NMSettingWireless *sw; 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 static void
ce_page_security_class_init (CEPageSecurityClass *class) ce_page_security_class_init (CEPageSecurityClass *class)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (class); GObjectClass *object_class = G_OBJECT_CLASS (class);
CEPageClass *page_class = CE_PAGE_CLASS (class); CEPageClass *page_class = CE_PAGE_CLASS (class);
object_class->dispose = dispose; object_class->dispose = ce_page_security_dispose;
page_class->validate = validate; page_class->validate = ce_page_security_validate;
} }
CEPage * CEPage *

30
panels/network/connection-editor/ce-page-vpn.c
View file

@ -109,10 +109,20 @@ connect_vpn_page (CEPageVpn *self)
g_signal_connect_swapped (self->name_entry, "changed", G_CALLBACK (ce_page_changed), 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 static gboolean
validate (CEPage *page, ce_page_vpn_validate (CEPage *page,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
CEPageVpn *self = CE_PAGE_VPN (page); 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 static void
ce_page_vpn_class_init (CEPageVpnClass *class) ce_page_vpn_class_init (CEPageVpnClass *class)
{ {
CEPageClass *page_class = CE_PAGE_CLASS (class); CEPageClass *page_class = CE_PAGE_CLASS (class);
GObjectClass *object_class = G_OBJECT_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 static void

8
panels/network/connection-editor/ce-page-wifi.c
View file

@ -110,9 +110,9 @@ ui_to_setting (CEPageWifi *self)
} }
static gboolean static gboolean
validate (CEPage *parent, ce_page_wifi_class_validate (CEPage *parent,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
CEPageWifi *self = (CEPageWifi *) parent; CEPageWifi *self = (CEPageWifi *) parent;
GtkWidget *entry; GtkWidget *entry;
@ -159,7 +159,7 @@ ce_page_wifi_class_init (CEPageWifiClass *class)
{ {
CEPageClass *page_class= CE_PAGE_CLASS (class); CEPageClass *page_class= CE_PAGE_CLASS (class);
page_class->validate = validate; page_class->validate = ce_page_wifi_class_validate;
} }
CEPage * CEPage *