GNOME.org
 

[network-manager-applet/nma-1-0: 5/8] c-e/trivial: rename virtual method validate()

commit d6d73c44ad052b9702c066cdf73fd29f5e07f4b0
Author: Thomas Haller <thaller redhat com>
Date:   Thu Sep 10 13:43:01 2015 +0200

    c-e/trivial: rename virtual method validate()
    
    There are other function names with the same name.
    This makes it hard to grep the source code to find
    all type implementations of ce_page_validate().
    
    (cherry picked from commit 9795468435d4ef70f7dd0ec3fa3e36735e37fbe1)

 src/connection-editor/ce-page.c             |    4 ++--
 src/connection-editor/ce-page.h             |    2 +-
 src/connection-editor/page-8021x-security.c |    4 ++--
 src/connection-editor/page-bluetooth.c      |    4 ++--
 src/connection-editor/page-bond.c           |    6 +++---
 src/connection-editor/page-bridge-port.c    |    4 ++--
 src/connection-editor/page-bridge.c         |    6 +++---
 src/connection-editor/page-dcb.c            |    4 ++--
 src/connection-editor/page-dsl.c            |    4 ++--
 src/connection-editor/page-ethernet.c       |    4 ++--
 src/connection-editor/page-general.c        |    4 ++--
 src/connection-editor/page-infiniband.c     |    4 ++--
 src/connection-editor/page-ip4.c            |    4 ++--
 src/connection-editor/page-ip6.c            |    4 ++--
 src/connection-editor/page-master.c         |    6 +++---
 src/connection-editor/page-mobile.c         |    4 ++--
 src/connection-editor/page-ppp.c            |    4 ++--
 src/connection-editor/page-team-port.c      |    4 ++--
 src/connection-editor/page-team.c           |    6 +++---
 src/connection-editor/page-vlan.c           |    4 ++--
 src/connection-editor/page-vpn.c            |    4 ++--
 src/connection-editor/page-wifi-security.c  |    4 ++--
 src/connection-editor/page-wifi.c           |    4 ++--
 src/connection-editor/page-wimax.c          |    4 ++--
 24 files changed, 51 insertions(+), 51 deletions(-)
---
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 03d2ddf..7dc1d26 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -132,8 +132,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 41711d9..a90386e 100644
--- a/src/connection-editor/ce-page.h
+++ b/src/connection-editor/ce-page.h
@@ -82,7 +82,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 69968aa..bb44dfc 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -143,7 +143,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;
@@ -212,5 +212,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 7882da0..4dbfd0b 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -143,7 +143,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);
@@ -169,7 +169,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 799ea94..6dd446f 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -560,13 +560,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);
@@ -597,7 +597,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 6383d15..0070689 100644
--- a/src/connection-editor/page-bridge-port.c
+++ b/src/connection-editor/page-bridge-port.c
@@ -145,7 +145,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);
@@ -168,5 +168,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 1ffcb1f..e4ce500 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -257,12 +257,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);
@@ -284,7 +284,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 1093f17..2306ec5 100644
--- a/src/connection-editor/page-dcb.c
+++ b/src/connection-editor/page-dcb.c
@@ -727,7 +727,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);
@@ -774,5 +774,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 c327979..17fbc34 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -182,7 +182,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);
@@ -212,7 +212,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 451ee22..0494f3d 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -335,7 +335,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);
@@ -368,7 +368,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 587ed63..be206b0 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -388,7 +388,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);
@@ -413,6 +413,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 19560a2..5ef3747 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -214,7 +214,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);
@@ -244,7 +244,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 5559e66..d94d969 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -1221,7 +1221,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);
@@ -1266,6 +1266,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 6aa55cc..e577e39 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -1208,7 +1208,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);
@@ -1253,6 +1253,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 6830518..e56cc5f 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -610,7 +610,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);
 
@@ -620,7 +620,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;
 }
 
@@ -684,7 +684,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 ef24184..0a7704f 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -401,7 +401,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);
@@ -432,7 +432,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 472b075..fe67bca 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -360,7 +360,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);
@@ -394,6 +394,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 149e00e..3b965de 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -196,7 +196,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);
@@ -219,5 +219,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 9efa43d..edec9d0 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -322,12 +322,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);
@@ -354,7 +354,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 9a98d3b..f782068 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -625,7 +625,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);
@@ -688,7 +688,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 004a260..fac255d 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -147,7 +147,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);
@@ -182,7 +182,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 d2d09c6..05beb30 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -457,7 +457,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);
@@ -524,5 +524,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 8a25c64..3d4386b 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -570,7 +570,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);
@@ -613,7 +613,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;
 }
 
 
diff --git a/src/connection-editor/page-wimax.c b/src/connection-editor/page-wimax.c
index 97c4d90..dc425c5 100644
--- a/src/connection-editor/page-wimax.c
+++ b/src/connection-editor/page-wimax.c
@@ -172,7 +172,7 @@ ui_to_setting (CEPageWimax *self)
 }
 
 static gboolean
-validate (CEPage *page, NMConnection *connection, GError **error)
+ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error)
 {
        CEPageWimax *self = CE_PAGE_WIMAX (page);
        CEPageWimaxPrivate *priv = CE_PAGE_WIMAX_GET_PRIVATE (self);
@@ -207,7 +207,7 @@ ce_page_wimax_class_init (CEPageWimaxClass *wimax_class)
        g_type_class_add_private (object_class, sizeof (CEPageWimaxPrivate));
 
        /* virtual methods */
-       parent_class->validate = validate;
+       parent_class->ce_page_validate_v = ce_page_validate_v;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]