diff options
23 files changed, 49 insertions, 49 deletions
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c index 5fa84839..5c75e35a 100644 --- a/src/connection-editor/ce-page.c +++ b/src/connection-editor/ce-page.c @@ -128,8 +128,8 @@ ce_page_validate (CEPage *self, NMConnection *connection, GError **error) g_return_val_if_fail (CE_IS_PAGE (self), FALSE); g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE); - if (CE_PAGE_GET_CLASS (self)->validate) - return CE_PAGE_GET_CLASS (self)->validate (self, connection, error); + if (CE_PAGE_GET_CLASS (self)->ce_page_validate_v) + return CE_PAGE_GET_CLASS (self)->ce_page_validate_v (self, connection, error); return TRUE; } diff --git a/src/connection-editor/ce-page.h b/src/connection-editor/ce-page.h index 1251aea5..758e3421 100644 --- a/src/connection-editor/ce-page.h +++ b/src/connection-editor/ce-page.h @@ -78,7 +78,7 @@ typedef struct { GObjectClass parent; /* Virtual functions */ - gboolean (*validate) (CEPage *self, NMConnection *connection, GError **error); + gboolean (*ce_page_validate_v) (CEPage *self, NMConnection *connection, GError **error); gboolean (*last_update) (CEPage *self, NMConnection *connection, GError **error); /* Signals */ diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c index 0c62d85d..f8895d61 100644 --- a/src/connection-editor/page-8021x-security.c +++ b/src/connection-editor/page-8021x-security.c @@ -134,7 +134,7 @@ ce_page_8021x_security_new (NMConnection *connection, } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPage8021xSecurityPrivate *priv = CE_PAGE_8021X_SECURITY_GET_PRIVATE (page); gboolean valid = TRUE; @@ -203,5 +203,5 @@ ce_page_8021x_security_class_init (CEPage8021xSecurityClass *security_class) /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c index 7ee30040..b7a19601 100644 --- a/src/connection-editor/page-bluetooth.c +++ b/src/connection-editor/page-bluetooth.c @@ -140,7 +140,7 @@ ui_to_setting (CEPageBluetooth *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageBluetooth *self = CE_PAGE_BLUETOOTH (page); CEPageBluetoothPrivate *priv = CE_PAGE_BLUETOOTH_GET_PRIVATE (self); @@ -166,7 +166,7 @@ ce_page_bluetooth_class_init (CEPageBluetoothClass *bluetooth_class) g_type_class_add_private (object_class, sizeof (CEPageBluetoothPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } typedef struct { diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c index cb690266..6ef5ac7a 100644 --- a/src/connection-editor/page-bond.c +++ b/src/connection-editor/page-bond.c @@ -554,13 +554,13 @@ ui_to_setting (CEPageBond *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageBond *self = CE_PAGE_BOND (page); CEPageBondPrivate *priv = CE_PAGE_BOND_GET_PRIVATE (self); const char *primary; - if (!CE_PAGE_CLASS (ce_page_bond_parent_class)->validate (page, connection, error)) + if (!CE_PAGE_CLASS (ce_page_bond_parent_class)->ce_page_validate_v (page, connection, error)) return FALSE; primary = gtk_entry_get_text (priv->primary); @@ -591,7 +591,7 @@ ce_page_bond_class_init (CEPageBondClass *bond_class) g_type_class_add_private (object_class, sizeof (CEPageBondPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; master_class->connection_added = connection_added; master_class->connection_removed = connection_removed; diff --git a/src/connection-editor/page-bridge-port.c b/src/connection-editor/page-bridge-port.c index 8d654b12..52e62601 100644 --- a/src/connection-editor/page-bridge-port.c +++ b/src/connection-editor/page-bridge-port.c @@ -139,7 +139,7 @@ ui_to_setting (CEPageBridgePort *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageBridgePort *self = CE_PAGE_BRIDGE_PORT (page); CEPageBridgePortPrivate *priv = CE_PAGE_BRIDGE_PORT_GET_PRIVATE (self); @@ -162,5 +162,5 @@ ce_page_bridge_port_class_init (CEPageBridgePortClass *bridge_port_class) g_type_class_add_private (object_class, sizeof (CEPageBridgePortPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c index 30fe5260..d3007a41 100644 --- a/src/connection-editor/page-bridge.c +++ b/src/connection-editor/page-bridge.c @@ -260,12 +260,12 @@ ui_to_setting (CEPageBridge *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageBridge *self = CE_PAGE_BRIDGE (page); CEPageBridgePrivate *priv = CE_PAGE_BRIDGE_GET_PRIVATE (self); - if (!CE_PAGE_CLASS (ce_page_bridge_parent_class)->validate (page, connection, error)) + if (!CE_PAGE_CLASS (ce_page_bridge_parent_class)->ce_page_validate_v (page, connection, error)) return FALSE; ui_to_setting (self); @@ -287,7 +287,7 @@ ce_page_bridge_class_init (CEPageBridgeClass *bridge_class) g_type_class_add_private (object_class, sizeof (CEPageBridgePrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; master_class->create_connection = create_connection; master_class->add_slave = add_slave; } diff --git a/src/connection-editor/page-dcb.c b/src/connection-editor/page-dcb.c index 2d18666c..b8405fe1 100644 --- a/src/connection-editor/page-dcb.c +++ b/src/connection-editor/page-dcb.c @@ -726,7 +726,7 @@ ui_to_setting (CEPageDcb *self, NMSettingDcb *s_dcb) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageDcb *self = CE_PAGE_DCB (page); CEPageDcbPrivate *priv = CE_PAGE_DCB_GET_PRIVATE (self); @@ -773,5 +773,5 @@ ce_page_dcb_class_init (CEPageDcbClass *security_class) /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c index ac480eee..aeb9f55e 100644 --- a/src/connection-editor/page-dsl.c +++ b/src/connection-editor/page-dsl.c @@ -175,7 +175,7 @@ ui_to_setting (CEPageDsl *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageDsl *self = CE_PAGE_DSL (page); CEPageDslPrivate *priv = CE_PAGE_DSL_GET_PRIVATE (self); @@ -198,7 +198,7 @@ ce_page_dsl_class_init (CEPageDslClass *dsl_class) g_type_class_add_private (object_class, sizeof (CEPageDslPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c index 5363d9a7..7134f009 100644 --- a/src/connection-editor/page-ethernet.c +++ b/src/connection-editor/page-ethernet.c @@ -325,7 +325,7 @@ ui_to_setting (CEPageEthernet *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageEthernet *self = CE_PAGE_ETHERNET (page); CEPageEthernetPrivate *priv = CE_PAGE_ETHERNET_GET_PRIVATE (self); @@ -358,7 +358,7 @@ ce_page_ethernet_class_init (CEPageEthernetClass *ethernet_class) g_type_class_add_private (object_class, sizeof (CEPageEthernetPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c index 477c0be2..1f713287 100644 --- a/src/connection-editor/page-general.c +++ b/src/connection-editor/page-general.c @@ -413,7 +413,7 @@ ui_to_setting (CEPageGeneral *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageGeneral *self = CE_PAGE_GENERAL (page); CEPageGeneralPrivate *priv = CE_PAGE_GENERAL_GET_PRIVATE (self); @@ -438,6 +438,6 @@ ce_page_general_class_init (CEPageGeneralClass *connection_class) /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c index a936f447..06db6f0c 100644 --- a/src/connection-editor/page-infiniband.c +++ b/src/connection-editor/page-infiniband.c @@ -206,7 +206,7 @@ ui_to_setting (CEPageInfiniband *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageInfiniband *self = CE_PAGE_INFINIBAND (page); CEPageInfinibandPrivate *priv = CE_PAGE_INFINIBAND_GET_PRIVATE (self); @@ -236,7 +236,7 @@ ce_page_infiniband_class_init (CEPageInfinibandClass *infiniband_class) g_type_class_add_private (object_class, sizeof (CEPageInfinibandPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c index 30f33840..aaad004b 100644 --- a/src/connection-editor/page-ip4.c +++ b/src/connection-editor/page-ip4.c @@ -1364,7 +1364,7 @@ out: } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageIP4 *self = CE_PAGE_IP4 (page); CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (self); @@ -1409,6 +1409,6 @@ ce_page_ip4_class_init (CEPageIP4Class *ip4_class) g_type_class_add_private (object_class, sizeof (CEPageIP4Private)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; object_class->dispose = dispose; } diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c index 6c0e9f40..5f3abe56 100644 --- a/src/connection-editor/page-ip6.c +++ b/src/connection-editor/page-ip6.c @@ -1361,7 +1361,7 @@ out: } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageIP6 *self = CE_PAGE_IP6 (page); CEPageIP6Private *priv = CE_PAGE_IP6_GET_PRIVATE (self); @@ -1406,6 +1406,6 @@ ce_page_ip6_class_init (CEPageIP6Class *ip6_class) g_type_class_add_private (object_class, sizeof (CEPageIP6Private)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; object_class->dispose = dispose; } diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c index 58b3bc6f..82072a4e 100644 --- a/src/connection-editor/page-master.c +++ b/src/connection-editor/page-master.c @@ -604,7 +604,7 @@ ui_to_setting (CEPageMaster *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageMaster *self = CE_PAGE_MASTER (page); @@ -614,7 +614,7 @@ validate (CEPage *page, NMConnection *connection, GError **error) ui_to_setting (self); - /* Subtype validate() method will validate the interface name */ + /* Subtype ce_page_validate_v() method will validate the interface name */ return TRUE; } @@ -678,7 +678,7 @@ ce_page_master_class_init (CEPageMasterClass *master_class) object_class->constructed = constructed; object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; parent_class->last_update = last_update; /* Signals */ diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c index 56bfd219..375b7173 100644 --- a/src/connection-editor/page-mobile.c +++ b/src/connection-editor/page-mobile.c @@ -392,7 +392,7 @@ ui_to_setting (CEPageMobile *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageMobile *self = CE_PAGE_MOBILE (page); CEPageMobilePrivate *priv = CE_PAGE_MOBILE_GET_PRIVATE (self); @@ -423,7 +423,7 @@ ce_page_mobile_class_init (CEPageMobileClass *mobile_class) g_type_class_add_private (object_class, sizeof (CEPageMobilePrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; object_class->dispose = dispose; } diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c index e509a72e..a6e28ee8 100644 --- a/src/connection-editor/page-ppp.c +++ b/src/connection-editor/page-ppp.c @@ -355,7 +355,7 @@ ui_to_setting (CEPagePpp *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPagePpp *self = CE_PAGE_PPP (page); CEPagePppPrivate *priv = CE_PAGE_PPP_GET_PRIVATE (self); @@ -389,6 +389,6 @@ ce_page_ppp_class_init (CEPagePppClass *ppp_class) g_type_class_add_private (object_class, sizeof (CEPagePppPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; object_class->dispose = dispose; } diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c index 5b24bb55..ebf86e01 100644 --- a/src/connection-editor/page-team-port.c +++ b/src/connection-editor/page-team-port.c @@ -191,7 +191,7 @@ ui_to_setting (CEPageTeamPort *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageTeamPort *self = CE_PAGE_TEAM_PORT (page); CEPageTeamPortPrivate *priv = CE_PAGE_TEAM_PORT_GET_PRIVATE (self); @@ -214,5 +214,5 @@ ce_page_team_port_class_init (CEPageTeamPortClass *team_port_class) g_type_class_add_private (object_class, sizeof (CEPageTeamPortPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c index 910123be..1ac337fb 100644 --- a/src/connection-editor/page-team.c +++ b/src/connection-editor/page-team.c @@ -319,12 +319,12 @@ ui_to_setting (CEPageTeam *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageTeam *self = CE_PAGE_TEAM (page); CEPageTeamPrivate *priv = CE_PAGE_TEAM_GET_PRIVATE (self); - if (!CE_PAGE_CLASS (ce_page_team_parent_class)->validate (page, connection, error)) + if (!CE_PAGE_CLASS (ce_page_team_parent_class)->ce_page_validate_v (page, connection, error)) return FALSE; ui_to_setting (self); @@ -351,7 +351,7 @@ ce_page_team_class_init (CEPageTeamClass *team_class) g_type_class_add_private (object_class, sizeof (CEPageTeamPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; master_class->create_connection = create_connection; master_class->connection_added = connection_added; master_class->connection_removed = connection_removed; diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c index 9a0cc86c..c088cf62 100644 --- a/src/connection-editor/page-vlan.c +++ b/src/connection-editor/page-vlan.c @@ -714,7 +714,7 @@ ui_to_setting (CEPageVlan *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageVlan *self = CE_PAGE_VLAN (page); CEPageVlanPrivate *priv = CE_PAGE_VLAN_GET_PRIVATE (self); @@ -775,7 +775,7 @@ ce_page_vlan_class_init (CEPageVlanClass *vlan_class) /* virtual methods */ object_class->finalize = finalize; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c index 1b976562..376a40a3 100644 --- a/src/connection-editor/page-vpn.c +++ b/src/connection-editor/page-vpn.c @@ -138,7 +138,7 @@ ce_page_vpn_can_export (CEPageVpn *page) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageVpn *self = CE_PAGE_VPN (page); CEPageVpnPrivate *priv = CE_PAGE_VPN_GET_PRIVATE (self); @@ -173,7 +173,7 @@ ce_page_vpn_class_init (CEPageVpnClass *vpn_class) /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } typedef struct { diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c index 3e8d50e4..73c85ca3 100644 --- a/src/connection-editor/page-wifi-security.c +++ b/src/connection-editor/page-wifi-security.c @@ -448,7 +448,7 @@ dispose (GObject *object) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageWifiSecurity *self = CE_PAGE_WIFI_SECURITY (page); CEPageWifiSecurityPrivate *priv = CE_PAGE_WIFI_SECURITY_GET_PRIVATE (self); @@ -515,5 +515,5 @@ ce_page_wifi_security_class_init (CEPageWifiSecurityClass *wireless_security_cla /* virtual methods */ object_class->dispose = dispose; - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c index ea508054..4f09cda0 100644 --- a/src/connection-editor/page-wifi.c +++ b/src/connection-editor/page-wifi.c @@ -554,7 +554,7 @@ ui_to_setting (CEPageWifi *self) } static gboolean -validate (CEPage *page, NMConnection *connection, GError **error) +ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error) { CEPageWifi *self = CE_PAGE_WIFI (page); CEPageWifiPrivate *priv = CE_PAGE_WIFI_GET_PRIVATE (self); @@ -597,7 +597,7 @@ ce_page_wifi_class_init (CEPageWifiClass *wifi_class) g_type_class_add_private (object_class, sizeof (CEPageWifiPrivate)); /* virtual methods */ - parent_class->validate = validate; + parent_class->ce_page_validate_v = ce_page_validate_v; } |