Commit 3ac0f528 authored by Dan Winship's avatar Dan Winship

libnm, core, cli, tui: fix the capitalization of various types

GLib/Gtk have mostly settled on the convention that two-letter
acronyms in type names remain all-caps (eg, "IO"), but longer acronyms
become initial-caps-only (eg, "Tcp").

NM was inconsistent, with most long acronyms using initial caps only
(Adsl, Cdma, Dcb, Gsm, Olpc, Vlan), but others using all caps (DHCP,
PPP, PPPOE, VPN). Fix libnm and src/ to use initial-caps only for all
three-or-more-letter-long acronyms (and update nmcli and nmtui for the
libnm changes).
parent b4ae6eae
......@@ -286,7 +286,7 @@ print_ip6_config (NMIP6Config *cfg6,
}
gboolean
print_dhcp4_config (NMDHCP4Config *dhcp4,
print_dhcp4_config (NMDhcp4Config *dhcp4,
NmCli *nmc,
const char *group_prefix,
const char *one_field)
......@@ -334,7 +334,7 @@ print_dhcp4_config (NMDHCP4Config *dhcp4,
}
gboolean
print_dhcp6_config (NMDHCP6Config *dhcp6,
print_dhcp6_config (NMDhcp6Config *dhcp6,
NmCli *nmc,
const char *group_prefix,
const char *one_field)
......
......@@ -34,8 +34,8 @@
gboolean print_ip4_config (NMIP4Config *cfg4, NmCli *nmc, const char *group_prefix, const char *one_field);
gboolean print_ip6_config (NMIP6Config *cfg6, NmCli *nmc, const char *group_prefix, const char *one_field);
gboolean print_dhcp4_config (NMDHCP4Config *dhcp4, NmCli *nmc, const char *group_prefix, const char *one_field);
gboolean print_dhcp6_config (NMDHCP6Config *dhcp6, NmCli *nmc, const char *group_prefix, const char *one_field);
gboolean print_dhcp4_config (NMDhcp4Config *dhcp4, NmCli *nmc, const char *group_prefix, const char *one_field);
gboolean print_dhcp6_config (NMDhcp6Config *dhcp6, NmCli *nmc, const char *group_prefix, const char *one_field);
NMIP4Address *nmc_parse_and_build_ip4_address (const char *ip_str, const char *gw_str, GError **error);
NMIP6Address *nmc_parse_and_build_ip6_address (const char *ip_str, const char *gw_str, GError **error);
......
......@@ -567,7 +567,7 @@ active_connection_state_to_string (NMActiveConnectionState state)
}
static const char *
vpn_connection_state_to_string (NMVPNConnectionState state)
vpn_connection_state_to_string (NMVpnConnectionState state)
{
switch (state) {
case NM_VPN_CONNECTION_STATE_PREPARE:
......@@ -1088,7 +1088,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
/* DHCP4 */
if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[2].name) == 0) {
gboolean b1 = FALSE;
NMDHCP4Config *dhcp4 = nm_active_connection_get_dhcp4_config (acon);
NMDhcp4Config *dhcp4 = nm_active_connection_get_dhcp4_config (acon);
b1 = print_dhcp4_config (dhcp4, nmc, "DHCP4", group_fld);
was_output = was_output || b1;
......@@ -1106,7 +1106,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
/* DHCP6 */
if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[4].name) == 0) {
gboolean b1 = FALSE;
NMDHCP6Config *dhcp6 = nm_active_connection_get_dhcp6_config (acon);
NMDhcp6Config *dhcp6 = nm_active_connection_get_dhcp6_config (acon);
b1 = print_dhcp6_config (dhcp6, nmc, "DHCP6", group_fld);
was_output = was_output || b1;
......@@ -1117,8 +1117,8 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[5].name) == 0) {
NMConnection *con;
NMSettingConnection *s_con;
NMSettingVPN *s_vpn;
NMVPNConnectionState vpn_state;
NMSettingVpn *s_vpn;
NMVpnConnectionState vpn_state;
char *type_str, *banner_str, *vpn_state_str;
const char *username = NULL;
char **vpn_data_array = NULL;
......@@ -1625,7 +1625,7 @@ find_device_for_connection (NmCli *nmc,
}
static const char *
vpn_connection_state_reason_to_string (NMVPNConnectionStateReason reason)
vpn_connection_state_reason_to_string (NMVpnConnectionStateReason reason)
{
switch (reason) {
case NM_VPN_CONNECTION_STATE_REASON_UNKNOWN:
......@@ -1680,9 +1680,9 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin
}
static void
vpn_connection_state_cb (NMVPNConnection *vpn,
NMVPNConnectionState state,
NMVPNConnectionStateReason reason,
vpn_connection_state_cb (NMVpnConnection *vpn,
NMVpnConnectionState state,
NMVpnConnectionStateReason reason,
gpointer user_data)
{
NmCli *nmc = (NmCli *) user_data;
......@@ -1752,7 +1752,7 @@ progress_device_cb (gpointer user_data)
static gboolean
progress_vpn_cb (gpointer user_data)
{
NMVPNConnection *vpn = (NMVPNConnection *) user_data;
NMVpnConnection *vpn = (NMVpnConnection *) user_data;
const char *str;
str = NM_IS_VPN_CONNECTION (vpn) ?
......@@ -3643,7 +3643,7 @@ complete_connection_by_type (NMConnection *connection,
NMSettingInfiniband *s_infiniband;
NMSettingWireless *s_wifi;
NMSettingWimax *s_wimax;
NMSettingPPPOE *s_pppoe;
NMSettingPppoe *s_pppoe;
NMSettingGsm *s_gsm;
NMSettingCdma *s_cdma;
NMSettingBluetooth *s_bt;
......@@ -3653,7 +3653,7 @@ complete_connection_by_type (NMConnection *connection,
NMSettingTeamPort *s_team_port;
NMSettingBridge *s_bridge;
NMSettingBridgePort *s_bridge_port;
NMSettingVPN *s_vpn;
NMSettingVpn *s_vpn;
NMSettingOlpcMesh *s_olpc_mesh;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
......@@ -3968,7 +3968,7 @@ cleanup_wimax:
goto cleanup_pppoe;
/* Add 'pppoe' setting */
s_pppoe = (NMSettingPPPOE *) nm_setting_pppoe_new ();
s_pppoe = (NMSettingPppoe *) nm_setting_pppoe_new ();
nm_connection_add_setting (connection, NM_SETTING (s_pppoe));
g_object_set (s_pppoe, NM_SETTING_PPPOE_USERNAME, username, NULL);
g_object_set (s_pppoe, NM_SETTING_PPPOE_PASSWORD, password, NULL);
......@@ -4808,7 +4808,7 @@ cleanup_bridge_slave:
do_questionnaire_vpn (&user);
/* Add 'vpn' setting */
s_vpn = (NMSettingVPN *) nm_setting_vpn_new ();
s_vpn = (NMSettingVpn *) nm_setting_vpn_new ();
nm_connection_add_setting (connection, NM_SETTING (s_vpn));
g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_type, NULL);
......
......@@ -742,8 +742,8 @@ show_device_info (NMDevice *device, NmCli *nmc)
gboolean was_output = FALSE;
NMIP4Config *cfg4;
NMIP6Config *cfg6;
NMDHCP4Config *dhcp4;
NMDHCP6Config *dhcp6;
NMDhcp4Config *dhcp4;
NMDhcp6Config *dhcp6;
const char *base_hdr = _("Device details");
GPtrArray *fields_in_section = NULL;
......
......@@ -1345,7 +1345,7 @@ DEFINE_GETTER (nmc_property_vpn_get_user_name, NM_SETTING_VPN_USER_NAME)
static char *
nmc_property_vpn_get_data (NMSetting *setting)
{
NMSettingVPN *s_vpn = NM_SETTING_VPN (setting);
NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
GString *data_item_str;
data_item_str = g_string_new (NULL);
......@@ -1357,7 +1357,7 @@ nmc_property_vpn_get_data (NMSetting *setting)
static char *
nmc_property_vpn_get_secrets (NMSetting *setting)
{
NMSettingVPN *s_vpn = NM_SETTING_VPN (setting);
NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
GString *secret_str;
secret_str = g_string_new (NULL);
......@@ -3741,7 +3741,7 @@ nmc_property_vlan_remove_egress_priority_map (NMSetting *setting,
/* 'data' */
DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_data,
NM_SETTING_VPN,
NMSettingVPN,
NMSettingVpn,
nm_setting_vpn_add_data_item,
NULL,
NULL)
......@@ -3752,7 +3752,7 @@ DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_data,
/* 'secrets' */
DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_secrets,
NM_SETTING_VPN,
NMSettingVPN,
NMSettingVpn,
nm_setting_vpn_add_secret,
NULL,
NULL)
......@@ -6668,7 +6668,7 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean
setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
{
NMSettingPPP *s_ppp = NM_SETTING_PPP (setting);
NMSettingPpp *s_ppp = NM_SETTING_PPP (setting);
NmcOutputField *tmpl, *arr;
size_t tmpl_len;
......@@ -6711,7 +6711,7 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean
setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
{
NMSettingPPPOE *s_pppoe = NM_SETTING_PPPOE (setting);
NMSettingPppoe *s_pppoe = NM_SETTING_PPPOE (setting);
NmcOutputField *tmpl, *arr;
size_t tmpl_len;
......@@ -6858,7 +6858,7 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean
setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
{
NMSettingVPN *s_vpn = NM_SETTING_VPN (setting);
NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
NmcOutputField *tmpl, *arr;
size_t tmpl_len;
......
......@@ -298,7 +298,7 @@ static gboolean
add_pppoe_secrets (NmtSecretAgentRequest *request,
GPtrArray *secrets)
{
NMSettingPPPOE *s_pppoe = nm_connection_get_setting_pppoe (request->connection);
NMSettingPppoe *s_pppoe = nm_connection_get_setting_pppoe (request->connection);
NmtSecretAgentSecret *secret;
secret = nmt_secret_agent_secret_new (_("Username"),
......
......@@ -274,7 +274,7 @@ export_vpn_to_file_cb (GtkWidget *dialog, gint response, gpointer user_data)
GError *error = NULL;
NMVpnPluginUiInterface *plugin;
NMSettingConnection *s_con = NULL;
NMSettingVPN *s_vpn = NULL;
NMSettingVpn *s_vpn = NULL;
const char *service_type;
const char *id = NULL;
gboolean success = FALSE;
......@@ -363,7 +363,7 @@ vpn_export (NMConnection *connection)
{
GtkWidget *dialog;
NMVpnPluginUiInterface *plugin;
NMSettingVPN *s_vpn = NULL;
NMSettingVpn *s_vpn = NULL;
const char *service_type;
const char *home_folder;
......@@ -405,7 +405,7 @@ vpn_export (NMConnection *connection)
gboolean
vpn_supports_ipv6 (NMConnection *connection)
{
NMSettingVPN *s_vpn;
NMSettingVpn *s_vpn;
const char *service_type;
NMVpnPluginUiInterface *plugin;
guint32 capabilities;
......
......@@ -68,7 +68,7 @@
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config"
/**
* NMVPNServiceState:
* NMVpnServiceState:
* @NM_VPN_SERVICE_STATE_UNKNOWN: The state of the VPN plugin is unknown.
* @NM_VPN_SERVICE_STATE_INIT: The VPN plugin is initialized.
* @NM_VPN_SERVICE_STATE_SHUTDOWN: Not used.
......@@ -81,7 +81,7 @@
*
* (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)
*/
typedef enum NMVPNServiceState {
typedef enum NMVpnServiceState {
NM_VPN_SERVICE_STATE_UNKNOWN = 0,
NM_VPN_SERVICE_STATE_INIT,
NM_VPN_SERVICE_STATE_SHUTDOWN,
......@@ -89,11 +89,11 @@ typedef enum NMVPNServiceState {
NM_VPN_SERVICE_STATE_STARTED,
NM_VPN_SERVICE_STATE_STOPPING,
NM_VPN_SERVICE_STATE_STOPPED
} NMVPNServiceState;
} NMVpnServiceState;
/**
* NMVPNConnectionState:
* NMVpnConnectionState:
* @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
* unknown.
* @NM_VPN_CONNECTION_STATE_PREPARE: The VPN connection is preparing to
......@@ -111,7 +111,7 @@ typedef enum NMVPNServiceState {
*
* (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)
*/
typedef enum NMVPNConnectionState {
typedef enum NMVpnConnectionState {
NM_VPN_CONNECTION_STATE_UNKNOWN = 0,
NM_VPN_CONNECTION_STATE_PREPARE,
NM_VPN_CONNECTION_STATE_NEED_AUTH,
......@@ -120,10 +120,10 @@ typedef enum NMVPNConnectionState {
NM_VPN_CONNECTION_STATE_ACTIVATED,
NM_VPN_CONNECTION_STATE_FAILED,
NM_VPN_CONNECTION_STATE_DISCONNECTED
} NMVPNConnectionState;
} NMVpnConnectionState;
/**
* NMVPNConnectionStateReason:
* NMVpnConnectionStateReason:
* @NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: The reason for the VPN connection
* state change is unknown.
* @NM_VPN_CONNECTION_STATE_REASON_NONE: No reason was given for the VPN
......@@ -153,7 +153,7 @@ typedef enum NMVPNConnectionState {
*
* (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)
*/
typedef enum NMVPNConnectionStateReason {
typedef enum NMVpnConnectionStateReason {
NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
NM_VPN_CONNECTION_STATE_REASON_NONE,
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
......@@ -166,10 +166,10 @@ typedef enum NMVPNConnectionStateReason {
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED,
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
} NMVPNConnectionStateReason;
} NMVpnConnectionStateReason;
/**
* NMVPNPluginFailure:
* NMVpnPluginFailure:
* @NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: Login failed.
* @NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: Connect failed.
* @NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: Invalid IP configuration returned from
......@@ -183,7 +183,7 @@ typedef enum {
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED,
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
} NMVPNPluginFailure;
} NMVpnPluginFailure;
/*** Generic config ***/
......
......@@ -1843,32 +1843,32 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection)
* nm_connection_get_setting_ppp:
* @connection: the #NMConnection
*
* A shortcut to return any #NMSettingPPP the connection might contain.
* A shortcut to return any #NMSettingPpp the connection might contain.
*
* Returns: (transfer none): an #NMSettingPPP if the connection contains one, otherwise %NULL
* Returns: (transfer none): an #NMSettingPpp if the connection contains one, otherwise %NULL
**/
NMSettingPPP *
NMSettingPpp *
nm_connection_get_setting_ppp (NMConnection *connection)
{
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
return (NMSettingPPP *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
return (NMSettingPpp *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPP);
}
/**
* nm_connection_get_setting_pppoe:
* @connection: the #NMConnection
*
* A shortcut to return any #NMSettingPPPOE the connection might contain.
* A shortcut to return any #NMSettingPppoe the connection might contain.
*
* Returns: (transfer none): an #NMSettingPPPOE if the connection contains one, otherwise %NULL
* Returns: (transfer none): an #NMSettingPppoe if the connection contains one, otherwise %NULL
**/
NMSettingPPPOE *
NMSettingPppoe *
nm_connection_get_setting_pppoe (NMConnection *connection)
{
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
return (NMSettingPPPOE *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
return (NMSettingPppoe *) nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE);
}
/**
......@@ -1891,16 +1891,16 @@ nm_connection_get_setting_serial (NMConnection *connection)
* nm_connection_get_setting_vpn:
* @connection: the #NMConnection
*
* A shortcut to return any #NMSettingVPN the connection might contain.
* A shortcut to return any #NMSettingVpn the connection might contain.
*
* Returns: (transfer none): an #NMSettingVPN if the connection contains one, otherwise %NULL
* Returns: (transfer none): an #NMSettingVpn if the connection contains one, otherwise %NULL
**/
NMSettingVPN *
NMSettingVpn *
nm_connection_get_setting_vpn (NMConnection *connection)
{
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
return (NMSettingVPN *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
return (NMSettingVpn *) nm_connection_get_setting (connection, NM_TYPE_SETTING_VPN);
}
/**
......
......@@ -231,10 +231,10 @@ NMSettingInfiniband * nm_connection_get_setting_infiniband (NMConnec
NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection);
NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnection *connection);
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);
NMSettingPPP * nm_connection_get_setting_ppp (NMConnection *connection);
NMSettingPPPOE * nm_connection_get_setting_pppoe (NMConnection *connection);
NMSettingPpp * nm_connection_get_setting_ppp (NMConnection *connection);
NMSettingPppoe * nm_connection_get_setting_pppoe (NMConnection *connection);
NMSettingSerial * nm_connection_get_setting_serial (NMConnection *connection);
NMSettingVPN * nm_connection_get_setting_vpn (NMConnection *connection);
NMSettingVpn * nm_connection_get_setting_vpn (NMConnection *connection);
NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection);
NMSettingAdsl * nm_connection_get_setting_adsl (NMConnection *connection);
NMSettingWired * nm_connection_get_setting_wired (NMConnection *connection);
......
This diff is collapsed.
......@@ -28,16 +28,16 @@
G_BEGIN_DECLS
#define NM_TYPE_SETTING_PPP (nm_setting_ppp_get_type ())
#define NM_SETTING_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPPP))
#define NM_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
#define NM_SETTING_PPP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPpp))
#define NM_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPppClass))
#define NM_IS_SETTING_PPP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPP))
#define NM_IS_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPP))
#define NM_SETTING_PPP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
#define NM_SETTING_PPP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPppClass))
#define NM_SETTING_PPP_SETTING_NAME "ppp"
/**
* NMSettingPPPError:
* NMSettingPppError:
* @NM_SETTING_PPP_ERROR_UNKNOWN: unknown or unclassified error
* @NM_SETTING_PPP_ERROR_INVALID_PROPERTY: the property was invalid
* @NM_SETTING_PPP_ERROR_MISSING_PROPERTY: the property was missing and is
......@@ -50,7 +50,7 @@ typedef enum {
NM_SETTING_PPP_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/
NM_SETTING_PPP_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/
NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED /*< nick=RequireMPPENotAllowed >*/
} NMSettingPPPError;
} NMSettingPppError;
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
GQuark nm_setting_ppp_error_quark (void);
......@@ -76,7 +76,7 @@ GQuark nm_setting_ppp_error_quark (void);
typedef struct {
NMSetting parent;
} NMSettingPPP;
} NMSettingPpp;
typedef struct {
NMSettingClass parent;
......@@ -86,29 +86,29 @@ typedef struct {
void (*_reserved2) (void);
void (*_reserved3) (void);
void (*_reserved4) (void);
} NMSettingPPPClass;
} NMSettingPppClass;
GType nm_setting_ppp_get_type (void);
NMSetting *nm_setting_ppp_new (void);
gboolean nm_setting_ppp_get_noauth (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_nodeflate (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_require_mppe (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_crtscts (NMSettingPPP *setting);
guint32 nm_setting_ppp_get_baud (NMSettingPPP *setting);
guint32 nm_setting_ppp_get_mru (NMSettingPPP *setting);
guint32 nm_setting_ppp_get_mtu (NMSettingPPP *setting);
guint32 nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting);
guint32 nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);
gboolean nm_setting_ppp_get_noauth (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_nodeflate (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_require_mppe (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting);
gboolean nm_setting_ppp_get_crtscts (NMSettingPpp *setting);
guint32 nm_setting_ppp_get_baud (NMSettingPpp *setting);
guint32 nm_setting_ppp_get_mru (NMSettingPpp *setting);
guint32 nm_setting_ppp_get_mtu (NMSettingPpp *setting);
guint32 nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting);
guint32 nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
G_END_DECLS
......
......@@ -32,7 +32,7 @@
* @short_description: Describes PPPoE connection properties
* @include: nm-setting-pppoe.h
*
* The #NMSettingPPPOE object is a #NMSetting subclass that describes
* The #NMSettingPppoe object is a #NMSetting subclass that describes
* properties necessary for connection to networks that require PPPoE connections
* to provide IP transport, for example cable or DSL modems.
**/
......@@ -40,9 +40,9 @@
/**
* nm_setting_pppoe_error_quark:
*
* Registers an error quark for #NMSettingPPPOE if necessary.
* Registers an error quark for #NMSettingPppoe if necessary.
*
* Returns: the error quark used for #NMSettingPPPOE errors.
* Returns: the error quark used for #NMSettingPppoe errors.
**/
GQuark
nm_setting_pppoe_error_quark (void)
......@@ -55,21 +55,21 @@ nm_setting_pppoe_error_quark (void)
}
G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING,
G_DEFINE_TYPE_WITH_CODE (NMSettingPppoe, nm_setting_pppoe, NM_TYPE_SETTING,
_nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME,
g_define_type_id,
3,
NM_SETTING_PPPOE_ERROR))
NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPPOE)
#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEPrivate))
#define NM_SETTING_PPPOE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPPOE, NMSettingPppoePrivate))
typedef struct {
char *service;
char *username;
char *password;
NMSettingSecretFlags password_flags;
} NMSettingPPPOEPrivate;
} NMSettingPppoePrivate;
enum {
PROP_0,
......@@ -84,9 +84,9 @@ enum {
/**
* nm_setting_pppoe_new:
*
* Creates a new #NMSettingPPPOE object with default values.
* Creates a new #NMSettingPppoe object with default values.
*
* Returns: (transfer full): the new empty #NMSettingPPPOE object
* Returns: (transfer full): the new empty #NMSettingPppoe object
**/
NMSetting *
nm_setting_pppoe_new (void)
......@@ -96,12 +96,12 @@ nm_setting_pppoe_new (void)
/**
* nm_setting_pppoe_get_service:
* @setting: the #NMSettingPPPOE
* @setting: the #NMSettingPppoe
*
* Returns: the #NMSettingPPPOE:service property of the setting
* Returns: the #NMSettingPppoe:service property of the setting
**/
const char *
nm_setting_pppoe_get_service (NMSettingPPPOE *setting)
nm_setting_pppoe_get_service (NMSettingPppoe *setting)
{
g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
......@@ -110,12 +110,12 @@ nm_setting_pppoe_get_service (NMSettingPPPOE *setting)
/**
* nm_setting_pppoe_get_username:
* @setting: the #NMSettingPPPOE
* @setting: the #NMSettingPppoe
*
* Returns: the #NMSettingPPPOE:username property of the setting
* Returns: the #NMSettingPppoe:username property of the setting
**/
const char *
nm_setting_pppoe_get_username (NMSettingPPPOE *setting)
nm_setting_pppoe_get_username (NMSettingPppoe *setting)
{
g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
......@@ -124,12 +124,12 @@ nm_setting_pppoe_get_username (NMSettingPPPOE *setting)
/**
* nm_setting_pppoe_get_password:
* @setting: the #NMSettingPPPOE
* @setting: the #NMSettingPppoe
*
* Returns: the #NMSettingPPPOE:password property of the setting
* Returns: the #NMSettingPppoe:password property of the setting
**/
const char *
nm_setting_pppoe_get_password (NMSettingPPPOE *setting)
nm_setting_pppoe_get_password (NMSettingPppoe *setting)
{
g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NULL);
......@@ -138,12 +138,12 @@ nm_setting_pppoe_get_password (NMSettingPPPOE *setting)
/**
* nm_setting_pppoe_get_password_flags:
* @setting: the #NMSettingPPPOE
* @setting: the #NMSettingPppoe
*
* Returns: the #NMSettingSecretFlags pertaining to the #NMSettingPPPOE:password
* Returns: the #NMSettingSecretFlags pertaining to the #NMSettingPppoe:password
**/
NMSettingSecretFlags
nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting)
nm_setting_pppoe_get_password_flags (NMSettingPppoe *setting)
{
g_return_val_if_fail (NM_IS_SETTING_PPPOE (setting), NM_SETTING_SECRET_FLAG_NONE);
......@@ -153,7 +153,7 @@ nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting)
static gboolean
verify (NMSetting *setting, GSList *all_settings, GError **error)
{
NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
if (!priv->username) {
g_set_error_literal (error,
......@@ -186,7 +186,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
static GPtrArray *
need_secrets (NMSetting *setting)
{
NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
GPtrArray *secrets = NULL;
if (priv->password)
......@@ -201,7 +201,7 @@ need_secrets (NMSetting *setting)
}
static void
nm_setting_pppoe_init (NMSettingPPPOE *setting)
nm_setting_pppoe_init (NMSettingPppoe *setting)
{
}
......@@ -209,7 +209,7 @@ static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
switch (prop_id) {
case PROP_SERVICE:
......@@ -237,7 +237,7 @@ static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMSettingPPPOE *setting = NM_SETTING_PPPOE (object);
NMSettingPppoe *setting = NM_SETTING_PPPOE (object);
switch (prop_id) {
case PROP_SERVICE:
......@@ -261,7 +261,7 @@ get_property (GObject *object, guint prop_id,
static void
finalize (GObject *object)
{
NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
NMSettingPppoePrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (object);
g_free (priv->username);
g_free (priv->password);
......@@ -271,12 +271,12 @@ finalize (GObject *object)
}
static void
nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
nm_setting_pppoe_class_init (NMSettingPppoeClass *setting_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
g_type_class_add_private (setting_class, sizeof (NMSettingPPPOEPrivate));
g_type_class_add_private (setting_class, sizeof (NMSettingPppoePrivate));
/* virtual methods */
object_class->set_property = set_property;
......@@ -287,7 +287,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
/* Properties */
/**
* NMSettingPPPOE:service:
* NMSettingPppoe:service:
*
* If specified, instruct PPPoE to only initiate sessions with access
* concentrators that provide the specified service. For most providers,
......@@ -302,7 +302,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
G_PARAM_STATIC_STRINGS));
/**
* NMSettingPPPOE:username:
* NMSettingPppoe:username:
*
* Username used to authenticate with the PPPoE service.
**/
......@@ -314,7 +314,7 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
G_PARAM_STATIC_STRINGS));
/**
* NMSettingPPPOE:password:
* NMSettingPppoe:password:
*
* Password used to authenticate with the PPPoE service.
**/
......@@ -327,9 +327,9 @@ nm_setting_pppoe_class_init (NMSettingPPPOEClass *setting_class)
G_PARAM_STATIC_STRINGS));
/**
* NMSettingPPPOE:password-flags:
* NMSettingPppoe:password-flags:
*
* Flags indicating how to handle the #NMSettingPPPOE:password property.
* Flags indicating how to handle the #NMSettingPppoe:password property.
**/
g_object_class_install_property
(object_class, PROP_PASSWORD_FLAGS,
......
......@@ -28,16 +28,16 @@
G_BEGIN_DECLS
#define NM_TYPE_SETTING_PPPOE (nm_setting_pppoe_get_type ())
#define NM_SETTING_PPPOE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOE))
#define NM_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass))
#define NM_SETTING_PPPOE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPppoe))
#define NM_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPPOE, NMSettingPppoeClass))
#define NM_IS_SETTING_PPPOE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPPOE))
#define NM_IS_SETTING_PPPOE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PPPOE))
#define NM_SETTING_PPPOE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPPPOEClass))
#define NM_SETTING_PPPOE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPPOE, NMSettingPppoeClass))