Commit 39f47e2f authored by Thomas Haller's avatar Thomas Haller
Browse files

wwan/trivial: rename NMModemClass.check_connection_compatible() to use unique name

We also have NMDeviceClass.check_connection_compatible(). It is preferable
to use unique names, especially for the virtual function table. A reasonable
thing to do is grep for the function name to find all places that implement
this function. But if different classes use the same name, grep just
turns up annoying false positives.
parent 0ee782d0
......@@ -617,7 +617,7 @@ act_stage1_prepare (NMModem *_self,
/*****************************************************************************/
static gboolean
check_connection_compatible (NMModem *_self, NMConnection *connection)
check_connection_compatible_with_modem (NMModem *_self, NMConnection *connection)
{
NMModemBroadband *self = NM_MODEM_BROADBAND (_self);
MMModemCapability modem_caps;
......@@ -1476,7 +1476,7 @@ nm_modem_broadband_class_init (NMModemBroadbandClass *klass)
modem_class->deactivate_cleanup = deactivate_cleanup;
modem_class->set_mm_enabled = set_mm_enabled;
modem_class->get_user_pass = get_user_pass;
modem_class->check_connection_compatible = check_connection_compatible;
modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem;
modem_class->complete_connection = complete_connection;
modem_class->act_stage1_prepare = act_stage1_prepare;
modem_class->owns_port = owns_port;
......
......@@ -279,8 +279,8 @@ deactivate_cleanup (NMModem *modem, NMDevice *device)
}
static gboolean
check_connection_compatible (NMModem *modem,
NMConnection *connection)
check_connection_compatible_with_modem (NMModem *modem,
NMConnection *connection)
{
NMModemOfono *self = NM_MODEM_OFONO (modem);
NMModemOfonoPrivate *priv = NM_MODEM_OFONO_GET_PRIVATE (self);
......@@ -1326,7 +1326,7 @@ nm_modem_ofono_class_init (NMModemOfonoClass *klass)
modem_class->disconnect = disconnect;
modem_class->disconnect_finish = disconnect_finish;
modem_class->deactivate_cleanup = deactivate_cleanup;
modem_class->check_connection_compatible = check_connection_compatible;
modem_class->check_connection_compatible_with_modem = check_connection_compatible_with_modem;
modem_class->act_stage1_prepare = act_stage1_prepare;
modem_class->static_stage3_ip4_config_start = static_stage3_ip4_config_start;
......
......@@ -1086,8 +1086,8 @@ nm_modem_check_connection_compatible (NMModem *self, NMConnection *connection)
}
}
if (NM_MODEM_GET_CLASS (self)->check_connection_compatible)
return NM_MODEM_GET_CLASS (self)->check_connection_compatible (self, connection);
if (NM_MODEM_GET_CLASS (self)->check_connection_compatible_with_modem)
return NM_MODEM_GET_CLASS (self)->check_connection_compatible_with_modem (self, connection);
return FALSE;
}
......
......@@ -121,8 +121,8 @@ typedef struct {
const char **user,
const char **pass);
gboolean (*check_connection_compatible) (NMModem *modem,
NMConnection *connection);
gboolean (*check_connection_compatible_with_modem) (NMModem *modem,
NMConnection *connection);
gboolean (*complete_connection) (NMModem *modem,
NMConnection *connection,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment