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, ...@@ -286,7 +286,7 @@ print_ip6_config (NMIP6Config *cfg6,
} }
gboolean gboolean
print_dhcp4_config (NMDHCP4Config *dhcp4, print_dhcp4_config (NMDhcp4Config *dhcp4,
NmCli *nmc, NmCli *nmc,
const char *group_prefix, const char *group_prefix,
const char *one_field) const char *one_field)
...@@ -334,7 +334,7 @@ print_dhcp4_config (NMDHCP4Config *dhcp4, ...@@ -334,7 +334,7 @@ print_dhcp4_config (NMDHCP4Config *dhcp4,
} }
gboolean gboolean
print_dhcp6_config (NMDHCP6Config *dhcp6, print_dhcp6_config (NMDhcp6Config *dhcp6,
NmCli *nmc, NmCli *nmc,
const char *group_prefix, const char *group_prefix,
const char *one_field) const char *one_field)
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
gboolean print_ip4_config (NMIP4Config *cfg4, NmCli *nmc, const char *group_prefix, const char *one_field); 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_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_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_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); 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); 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) ...@@ -567,7 +567,7 @@ active_connection_state_to_string (NMActiveConnectionState state)
} }
static const char * static const char *
vpn_connection_state_to_string (NMVPNConnectionState state) vpn_connection_state_to_string (NMVpnConnectionState state)
{ {
switch (state) { switch (state) {
case NM_VPN_CONNECTION_STATE_PREPARE: case NM_VPN_CONNECTION_STATE_PREPARE:
...@@ -1088,7 +1088,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) ...@@ -1088,7 +1088,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
/* DHCP4 */ /* DHCP4 */
if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[2].name) == 0) { if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[2].name) == 0) {
gboolean b1 = FALSE; 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); b1 = print_dhcp4_config (dhcp4, nmc, "DHCP4", group_fld);
was_output = was_output || b1; was_output = was_output || b1;
...@@ -1106,7 +1106,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) ...@@ -1106,7 +1106,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
/* DHCP6 */ /* DHCP6 */
if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[4].name) == 0) { if (strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[4].name) == 0) {
gboolean b1 = FALSE; 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); b1 = print_dhcp6_config (dhcp6, nmc, "DHCP6", group_fld);
was_output = was_output || b1; was_output = was_output || b1;
...@@ -1117,8 +1117,8 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) ...@@ -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) { strcasecmp (nmc_fields_con_active_details_groups[group_idx].name, nmc_fields_con_active_details_groups[5].name) == 0) {
NMConnection *con; NMConnection *con;
NMSettingConnection *s_con; NMSettingConnection *s_con;
NMSettingVPN *s_vpn; NMSettingVpn *s_vpn;
NMVPNConnectionState vpn_state; NMVpnConnectionState vpn_state;
char *type_str, *banner_str, *vpn_state_str; char *type_str, *banner_str, *vpn_state_str;
const char *username = NULL; const char *username = NULL;
char **vpn_data_array = NULL; char **vpn_data_array = NULL;
...@@ -1625,7 +1625,7 @@ find_device_for_connection (NmCli *nmc, ...@@ -1625,7 +1625,7 @@ find_device_for_connection (NmCli *nmc,
} }
static const char * static const char *
vpn_connection_state_reason_to_string (NMVPNConnectionStateReason reason) vpn_connection_state_reason_to_string (NMVpnConnectionStateReason reason)
{ {
switch (reason) { switch (reason) {
case NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: case NM_VPN_CONNECTION_STATE_REASON_UNKNOWN:
...@@ -1680,9 +1680,9 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin ...@@ -1680,9 +1680,9 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin
} }
static void static void
vpn_connection_state_cb (NMVPNConnection *vpn, vpn_connection_state_cb (NMVpnConnection *vpn,
NMVPNConnectionState state, NMVpnConnectionState state,
NMVPNConnectionStateReason reason, NMVpnConnectionStateReason reason,
gpointer user_data) gpointer user_data)
{ {
NmCli *nmc = (NmCli *) user_data; NmCli *nmc = (NmCli *) user_data;
...@@ -1752,7 +1752,7 @@ progress_device_cb (gpointer user_data) ...@@ -1752,7 +1752,7 @@ progress_device_cb (gpointer user_data)
static gboolean static gboolean
progress_vpn_cb (gpointer user_data) progress_vpn_cb (gpointer user_data)
{ {
NMVPNConnection *vpn = (NMVPNConnection *) user_data; NMVpnConnection *vpn = (NMVpnConnection *) user_data;
const char *str; const char *str;
str = NM_IS_VPN_CONNECTION (vpn) ? str = NM_IS_VPN_CONNECTION (vpn) ?
...@@ -3643,7 +3643,7 @@ complete_connection_by_type (NMConnection *connection, ...@@ -3643,7 +3643,7 @@ complete_connection_by_type (NMConnection *connection,
NMSettingInfiniband *s_infiniband; NMSettingInfiniband *s_infiniband;
NMSettingWireless *s_wifi; NMSettingWireless *s_wifi;
NMSettingWimax *s_wimax; NMSettingWimax *s_wimax;
NMSettingPPPOE *s_pppoe; NMSettingPppoe *s_pppoe;
NMSettingGsm *s_gsm; NMSettingGsm *s_gsm;
NMSettingCdma *s_cdma; NMSettingCdma *s_cdma;
NMSettingBluetooth *s_bt; NMSettingBluetooth *s_bt;
...@@ -3653,7 +3653,7 @@ complete_connection_by_type (NMConnection *connection, ...@@ -3653,7 +3653,7 @@ complete_connection_by_type (NMConnection *connection,
NMSettingTeamPort *s_team_port; NMSettingTeamPort *s_team_port;
NMSettingBridge *s_bridge; NMSettingBridge *s_bridge;
NMSettingBridgePort *s_bridge_port; NMSettingBridgePort *s_bridge_port;
NMSettingVPN *s_vpn; NMSettingVpn *s_vpn;
NMSettingOlpcMesh *s_olpc_mesh; NMSettingOlpcMesh *s_olpc_mesh;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
...@@ -3968,7 +3968,7 @@ cleanup_wimax: ...@@ -3968,7 +3968,7 @@ cleanup_wimax:
goto cleanup_pppoe; goto cleanup_pppoe;
/* Add 'pppoe' setting */ /* 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)); 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_USERNAME, username, NULL);
g_object_set (s_pppoe, NM_SETTING_PPPOE_PASSWORD, password, NULL); g_object_set (s_pppoe, NM_SETTING_PPPOE_PASSWORD, password, NULL);
...@@ -4808,7 +4808,7 @@ cleanup_bridge_slave: ...@@ -4808,7 +4808,7 @@ cleanup_bridge_slave:
do_questionnaire_vpn (&user); do_questionnaire_vpn (&user);
/* Add 'vpn' setting */ /* 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)); nm_connection_add_setting (connection, NM_SETTING (s_vpn));
g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_type, NULL); g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, service_type, NULL);
......
...@@ -742,8 +742,8 @@ show_device_info (NMDevice *device, NmCli *nmc) ...@@ -742,8 +742,8 @@ show_device_info (NMDevice *device, NmCli *nmc)
gboolean was_output = FALSE; gboolean was_output = FALSE;
NMIP4Config *cfg4; NMIP4Config *cfg4;
NMIP6Config *cfg6; NMIP6Config *cfg6;
NMDHCP4Config *dhcp4; NMDhcp4Config *dhcp4;
NMDHCP6Config *dhcp6; NMDhcp6Config *dhcp6;
const char *base_hdr = _("Device details"); const char *base_hdr = _("Device details");
GPtrArray *fields_in_section = NULL; GPtrArray *fields_in_section = NULL;
......
...@@ -1345,7 +1345,7 @@ DEFINE_GETTER (nmc_property_vpn_get_user_name, NM_SETTING_VPN_USER_NAME) ...@@ -1345,7 +1345,7 @@ DEFINE_GETTER (nmc_property_vpn_get_user_name, NM_SETTING_VPN_USER_NAME)
static char * static char *
nmc_property_vpn_get_data (NMSetting *setting) 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; GString *data_item_str;
data_item_str = g_string_new (NULL); data_item_str = g_string_new (NULL);
...@@ -1357,7 +1357,7 @@ nmc_property_vpn_get_data (NMSetting *setting) ...@@ -1357,7 +1357,7 @@ nmc_property_vpn_get_data (NMSetting *setting)
static char * static char *
nmc_property_vpn_get_secrets (NMSetting *setting) nmc_property_vpn_get_secrets (NMSetting *setting)
{ {
NMSettingVPN *s_vpn = NM_SETTING_VPN (setting); NMSettingVpn *s_vpn = NM_SETTING_VPN (setting);
GString *secret_str; GString *secret_str;
secret_str = g_string_new (NULL); secret_str = g_string_new (NULL);
...@@ -3741,7 +3741,7 @@ nmc_property_vlan_remove_egress_priority_map (NMSetting *setting, ...@@ -3741,7 +3741,7 @@ nmc_property_vlan_remove_egress_priority_map (NMSetting *setting,
/* 'data' */ /* 'data' */
DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_data, DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_data,
NM_SETTING_VPN, NM_SETTING_VPN,
NMSettingVPN, NMSettingVpn,
nm_setting_vpn_add_data_item, nm_setting_vpn_add_data_item,
NULL, NULL,
NULL) NULL)
...@@ -3752,7 +3752,7 @@ DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_data, ...@@ -3752,7 +3752,7 @@ DEFINE_REMOVER_OPTION (nmc_property_vpn_remove_option_data,
/* 'secrets' */ /* 'secrets' */
DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_secrets, DEFINE_SETTER_OPTIONS (nmc_property_vpn_set_secrets,
NM_SETTING_VPN, NM_SETTING_VPN,
NMSettingVPN, NMSettingVpn,
nm_setting_vpn_add_secret, nm_setting_vpn_add_secret,
NULL, NULL,
NULL) NULL)
...@@ -6668,7 +6668,7 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop) ...@@ -6668,7 +6668,7 @@ setting_serial_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean static gboolean
setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop) 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; NmcOutputField *tmpl, *arr;
size_t tmpl_len; size_t tmpl_len;
...@@ -6711,7 +6711,7 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop) ...@@ -6711,7 +6711,7 @@ setting_ppp_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean static gboolean
setting_pppoe_details (NMSetting *setting, NmCli *nmc, const char *one_prop) 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; NmcOutputField *tmpl, *arr;
size_t tmpl_len; size_t tmpl_len;
...@@ -6858,7 +6858,7 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop) ...@@ -6858,7 +6858,7 @@ setting_olpc_mesh_details (NMSetting *setting, NmCli *nmc, const char *one_prop)
static gboolean static gboolean
setting_vpn_details (NMSetting *setting, NmCli *nmc, const char *one_prop) 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; NmcOutputField *tmpl, *arr;
size_t tmpl_len; size_t tmpl_len;
......
...@@ -298,7 +298,7 @@ static gboolean ...@@ -298,7 +298,7 @@ static gboolean
add_pppoe_secrets (NmtSecretAgentRequest *request, add_pppoe_secrets (NmtSecretAgentRequest *request,
GPtrArray *secrets) GPtrArray *secrets)
{ {
NMSettingPPPOE *s_pppoe = nm_connection_get_setting_pppoe (request->connection); NMSettingPppoe *s_pppoe = nm_connection_get_setting_pppoe (request->connection);
NmtSecretAgentSecret *secret; NmtSecretAgentSecret *secret;
secret = nmt_secret_agent_secret_new (_("Username"), secret = nmt_secret_agent_secret_new (_("Username"),
......
...@@ -274,7 +274,7 @@ export_vpn_to_file_cb (GtkWidget *dialog, gint response, gpointer user_data) ...@@ -274,7 +274,7 @@ export_vpn_to_file_cb (GtkWidget *dialog, gint response, gpointer user_data)
GError *error = NULL; GError *error = NULL;
NMVpnPluginUiInterface *plugin; NMVpnPluginUiInterface *plugin;
NMSettingConnection *s_con = NULL; NMSettingConnection *s_con = NULL;
NMSettingVPN *s_vpn = NULL; NMSettingVpn *s_vpn = NULL;
const char *service_type; const char *service_type;
const char *id = NULL; const char *id = NULL;
gboolean success = FALSE; gboolean success = FALSE;
...@@ -363,7 +363,7 @@ vpn_export (NMConnection *connection) ...@@ -363,7 +363,7 @@ vpn_export (NMConnection *connection)
{ {
GtkWidget *dialog; GtkWidget *dialog;
NMVpnPluginUiInterface *plugin; NMVpnPluginUiInterface *plugin;
NMSettingVPN *s_vpn = NULL; NMSettingVpn *s_vpn = NULL;
const char *service_type; const char *service_type;
const char *home_folder; const char *home_folder;
...@@ -405,7 +405,7 @@ vpn_export (NMConnection *connection) ...@@ -405,7 +405,7 @@ vpn_export (NMConnection *connection)
gboolean gboolean
vpn_supports_ipv6 (NMConnection *connection) vpn_supports_ipv6 (NMConnection *connection)
{ {
NMSettingVPN *s_vpn; NMSettingVpn *s_vpn;
const char *service_type; const char *service_type;
NMVpnPluginUiInterface *plugin; NMVpnPluginUiInterface *plugin;
guint32 capabilities; guint32 capabilities;
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
#define NM_DBUS_VPN_SIGNAL_IP4_CONFIG "IP4Config" #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_UNKNOWN: The state of the VPN plugin is unknown.
* @NM_VPN_SERVICE_STATE_INIT: The VPN plugin is initialized. * @NM_VPN_SERVICE_STATE_INIT: The VPN plugin is initialized.
* @NM_VPN_SERVICE_STATE_SHUTDOWN: Not used. * @NM_VPN_SERVICE_STATE_SHUTDOWN: Not used.
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
* *
* (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) * (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_UNKNOWN = 0,
NM_VPN_SERVICE_STATE_INIT, NM_VPN_SERVICE_STATE_INIT,
NM_VPN_SERVICE_STATE_SHUTDOWN, NM_VPN_SERVICE_STATE_SHUTDOWN,
...@@ -89,11 +89,11 @@ typedef enum NMVPNServiceState { ...@@ -89,11 +89,11 @@ typedef enum NMVPNServiceState {
NM_VPN_SERVICE_STATE_STARTED, NM_VPN_SERVICE_STATE_STARTED,
NM_VPN_SERVICE_STATE_STOPPING, NM_VPN_SERVICE_STATE_STOPPING,
NM_VPN_SERVICE_STATE_STOPPED NM_VPN_SERVICE_STATE_STOPPED
} NMVPNServiceState; } NMVpnServiceState;
/** /**
* NMVPNConnectionState: * NMVpnConnectionState:
* @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
* unknown. * unknown.
* @NM_VPN_CONNECTION_STATE_PREPARE: The VPN connection is preparing to * @NM_VPN_CONNECTION_STATE_PREPARE: The VPN connection is preparing to
...@@ -111,7 +111,7 @@ typedef enum NMVPNServiceState { ...@@ -111,7 +111,7 @@ typedef enum NMVPNServiceState {
* *
* (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) * (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_UNKNOWN = 0,
NM_VPN_CONNECTION_STATE_PREPARE, NM_VPN_CONNECTION_STATE_PREPARE,
NM_VPN_CONNECTION_STATE_NEED_AUTH, NM_VPN_CONNECTION_STATE_NEED_AUTH,
...@@ -120,10 +120,10 @@ typedef enum NMVPNConnectionState { ...@@ -120,10 +120,10 @@ typedef enum NMVPNConnectionState {
NM_VPN_CONNECTION_STATE_ACTIVATED, NM_VPN_CONNECTION_STATE_ACTIVATED,
NM_VPN_CONNECTION_STATE_FAILED, NM_VPN_CONNECTION_STATE_FAILED,
NM_VPN_CONNECTION_STATE_DISCONNECTED NM_VPN_CONNECTION_STATE_DISCONNECTED
} NMVPNConnectionState; } NMVpnConnectionState;
/** /**
* NMVPNConnectionStateReason: * NMVpnConnectionStateReason:
* @NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: The reason for the VPN connection * @NM_VPN_CONNECTION_STATE_REASON_UNKNOWN: The reason for the VPN connection
* state change is unknown. * state change is unknown.
* @NM_VPN_CONNECTION_STATE_REASON_NONE: No reason was given for the VPN * @NM_VPN_CONNECTION_STATE_REASON_NONE: No reason was given for the VPN
...@@ -153,7 +153,7 @@ typedef enum NMVPNConnectionState { ...@@ -153,7 +153,7 @@ typedef enum NMVPNConnectionState {
* *
* (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) * (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_UNKNOWN = 0,
NM_VPN_CONNECTION_STATE_REASON_NONE, NM_VPN_CONNECTION_STATE_REASON_NONE,
NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
...@@ -166,10 +166,10 @@ typedef enum NMVPNConnectionStateReason { ...@@ -166,10 +166,10 @@ typedef enum NMVPNConnectionStateReason {
NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS, NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED, NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED,
NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED
} NMVPNConnectionStateReason; } NMVpnConnectionStateReason;
/** /**
* NMVPNPluginFailure: * NMVpnPluginFailure:
* @NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: Login failed. * @NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: Login failed.
* @NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: Connect failed. * @NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED: Connect failed.
* @NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: Invalid IP configuration returned from * @NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG: Invalid IP configuration returned from
...@@ -183,7 +183,7 @@ typedef enum { ...@@ -183,7 +183,7 @@ typedef enum {
NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED, NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,
NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED, NM_VPN_PLUGIN_FAILURE_CONNECT_FAILED,
NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
} NMVPNPluginFailure; } NMVpnPluginFailure;
/*** Generic config ***/ /*** Generic config ***/
......
...@@ -1843,32 +1843,32 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection) ...@@ -1843,32 +1843,32 @@ nm_connection_get_setting_olpc_mesh (NMConnection *connection)
* nm_connection_get_setting_ppp: * nm_connection_get_setting_ppp:
* @connection: the #NMConnection * @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) nm_connection_get_setting_ppp (NMConnection *connection)
{ {
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); 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: * nm_connection_get_setting_pppoe:
* @connection: the #NMConnection * @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) nm_connection_get_setting_pppoe (NMConnection *connection)
{ {
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); 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) ...@@ -1891,16 +1891,16 @@ nm_connection_get_setting_serial (NMConnection *connection)
* nm_connection_get_setting_vpn: * nm_connection_get_setting_vpn:
* @connection: the #NMConnection * @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) nm_connection_get_setting_vpn (NMConnection *connection)
{ {
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); 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 ...@@ -231,10 +231,10 @@ NMSettingInfiniband * nm_connection_get_setting_infiniband (NMConnec
NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection); NMSettingIP4Config * nm_connection_get_setting_ip4_config (NMConnection *connection);
NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnection *connection); NMSettingIP6Config * nm_connection_get_setting_ip6_config (NMConnection *connection);
NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection); NMSettingOlpcMesh * nm_connection_get_setting_olpc_mesh (NMConnection *connection);
NMSettingPPP * nm_connection_get_setting_ppp (NMConnection *connection); NMSettingPpp * nm_connection_get_setting_ppp (NMConnection *connection);
NMSettingPPPOE * nm_connection_get_setting_pppoe (NMConnection *connection); NMSettingPppoe * nm_connection_get_setting_pppoe (NMConnection *connection);
NMSettingSerial * nm_connection_get_setting_serial (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); NMSettingWimax * nm_connection_get_setting_wimax (NMConnection *connection);
NMSettingAdsl * nm_connection_get_setting_adsl (NMConnection *connection); NMSettingAdsl * nm_connection_get_setting_adsl (NMConnection *connection);
NMSettingWired * nm_connection_get_setting_wired (NMConnection *connection);