diff options
| author | Dan Winship <danw@gnome.org> | 2014-06-26 13:44:36 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:06 -0400 |
| commit | 3ac0f528780895c474a437bd75ab7e4baeaa83aa (patch) | |
| tree | 29593182408053cc42b9f76f0245ff8a1b46634d | |
| parent | b4ae6eaec9cec10d68bdcce7151b07451e4de6a3 (diff) | |
| download | NetworkManager-3ac0f528780895c474a437bd75ab7e4baeaa83aa.tar.gz | |
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).
64 files changed, 1037 insertions, 1037 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c index 5236431d73..d860d6386d 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -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) diff --git a/clients/cli/common.h b/clients/cli/common.h index ec347500aa..1397194f17 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -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); diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 10660213d2..9c0597ca68 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -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); diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 36aab74fc1..9cf8203d7d 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -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; diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 3e7a7e2259..c952ecda96 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -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; diff --git a/clients/tui/nmt-secret-agent.c b/clients/tui/nmt-secret-agent.c index 7939a84379..147e11957c 100644 --- a/clients/tui/nmt-secret-agent.c +++ b/clients/tui/nmt-secret-agent.c @@ -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"), diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c index 2bdb501a37..fb0ee6f7f8 100644 --- a/clients/tui/vpn-helpers.c +++ b/clients/tui/vpn-helpers.c @@ -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; diff --git a/libnm-core/NetworkManagerVPN.h b/libnm-core/NetworkManagerVPN.h index 0827bbfb90..f5fdaf264c 100644 --- a/libnm-core/NetworkManagerVPN.h +++ b/libnm-core/NetworkManagerVPN.h @@ -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 ***/ diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 542650fdc1..3aa2bc9b05 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -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); } /** diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h index bb757f6415..cc2ba30c1e 100644 --- a/libnm-core/nm-connection.h +++ b/libnm-core/nm-connection.h @@ -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); diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 0e7c598b90..331bf72c7f 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -31,7 +31,7 @@ * that require PPP to deliver IP capability * @include: nm-setting-ppp.h * - * The #NMSettingPPP object is a #NMSetting subclass that describes properties + * The #NMSettingPpp object is a #NMSetting subclass that describes properties * necessary for connection to networks that require PPP transport, like PPPoE * cable and DSL modems and some mobile broadband devices. **/ @@ -39,9 +39,9 @@ /** * nm_setting_ppp_error_quark: * - * Registers an error quark for #NMSettingPPP if necessary. + * Registers an error quark for #NMSettingPpp if necessary. * - * Returns: the error quark used for #NMSettingPPP errors. + * Returns: the error quark used for #NMSettingPpp errors. **/ GQuark nm_setting_ppp_error_quark (void) @@ -54,14 +54,14 @@ nm_setting_ppp_error_quark (void) } -G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING, +G_DEFINE_TYPE_WITH_CODE (NMSettingPpp, nm_setting_ppp, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_PPP_SETTING_NAME, g_define_type_id, 3, NM_SETTING_PPP_ERROR)) NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_PPP) -#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPPPPrivate)) +#define NM_SETTING_PPP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_PPP, NMSettingPppPrivate)) typedef struct { gboolean noauth; @@ -82,7 +82,7 @@ typedef struct { guint32 mtu; guint32 lcp_echo_failure; guint32 lcp_echo_interval; -} NMSettingPPPPrivate; +} NMSettingPppPrivate; enum { PROP_0, @@ -111,9 +111,9 @@ enum { /** * nm_setting_ppp_new: * - * Creates a new #NMSettingPPP object with default values. + * Creates a new #NMSettingPpp object with default values. * - * Returns: (transfer full): the new empty #NMSettingPPP object + * Returns: (transfer full): the new empty #NMSettingPpp object **/ NMSetting * nm_setting_ppp_new (void) @@ -123,12 +123,12 @@ nm_setting_ppp_new (void) /** * nm_setting_ppp_get_noauth: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:noauth property of the setting + * Returns: the #NMSettingPpp:noauth property of the setting **/ gboolean -nm_setting_ppp_get_noauth (NMSettingPPP *setting) +nm_setting_ppp_get_noauth (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -137,12 +137,12 @@ nm_setting_ppp_get_noauth (NMSettingPPP *setting) /** * nm_setting_ppp_get_refuse_eap: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:refuse-eap property of the setting + * Returns: the #NMSettingPpp:refuse-eap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting) +nm_setting_ppp_get_refuse_eap (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -151,12 +151,12 @@ nm_setting_ppp_get_refuse_eap (NMSettingPPP *setting) /** * nm_setting_ppp_get_refuse_pap: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:refuse-pap property of the setting + * Returns: the #NMSettingPpp:refuse-pap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting) +nm_setting_ppp_get_refuse_pap (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -165,12 +165,12 @@ nm_setting_ppp_get_refuse_pap (NMSettingPPP *setting) /** * nm_setting_ppp_get_refuse_chap: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:refuse-chap property of the setting + * Returns: the #NMSettingPpp:refuse-chap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting) +nm_setting_ppp_get_refuse_chap (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -179,12 +179,12 @@ nm_setting_ppp_get_refuse_chap (NMSettingPPP *setting) /** * nm_setting_ppp_get_refuse_mschap: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:refuse-mschap property of the setting + * Returns: the #NMSettingPpp:refuse-mschap property of the setting **/ gboolean -nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting) +nm_setting_ppp_get_refuse_mschap (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -193,12 +193,12 @@ nm_setting_ppp_get_refuse_mschap (NMSettingPPP *setting) /** * nm_setting_ppp_get_refuse_mschapv2: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:refuse-mschapv2 property of the setting + * Returns: the #NMSettingPpp:refuse-mschapv2 property of the setting **/ gboolean -nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting) +nm_setting_ppp_get_refuse_mschapv2 (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -207,12 +207,12 @@ nm_setting_ppp_get_refuse_mschapv2 (NMSettingPPP *setting) /** * nm_setting_ppp_get_nobsdcomp: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:nobsdcomp property of the setting + * Returns: the #NMSettingPpp:nobsdcomp property of the setting **/ gboolean -nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting) +nm_setting_ppp_get_nobsdcomp (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -221,12 +221,12 @@ nm_setting_ppp_get_nobsdcomp (NMSettingPPP *setting) /** * nm_setting_ppp_get_nodeflate: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:nodeflate property of the setting + * Returns: the #NMSettingPpp:nodeflate property of the setting **/ gboolean -nm_setting_ppp_get_nodeflate (NMSettingPPP *setting) +nm_setting_ppp_get_nodeflate (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -235,12 +235,12 @@ nm_setting_ppp_get_nodeflate (NMSettingPPP *setting) /** * nm_setting_ppp_get_no_vj_comp: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:no-vj-comp property of the setting + * Returns: the #NMSettingPpp:no-vj-comp property of the setting **/ gboolean -nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting) +nm_setting_ppp_get_no_vj_comp (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -249,12 +249,12 @@ nm_setting_ppp_get_no_vj_comp (NMSettingPPP *setting) /** * nm_setting_ppp_get_require_mppe: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:require-mppe property of the setting + * Returns: the #NMSettingPpp:require-mppe property of the setting **/ gboolean -nm_setting_ppp_get_require_mppe (NMSettingPPP *setting) +nm_setting_ppp_get_require_mppe (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -263,12 +263,12 @@ nm_setting_ppp_get_require_mppe (NMSettingPPP *setting) /** * nm_setting_ppp_get_require_mppe_128: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:require-mppe-128 property of the setting + * Returns: the #NMSettingPpp:require-mppe-128 property of the setting **/ gboolean -nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting) +nm_setting_ppp_get_require_mppe_128 (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -277,12 +277,12 @@ nm_setting_ppp_get_require_mppe_128 (NMSettingPPP *setting) /** * nm_setting_ppp_get_mppe_stateful: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:mppe-stateful property of the setting + * Returns: the #NMSettingPpp:mppe-stateful property of the setting **/ gboolean -nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting) +nm_setting_ppp_get_mppe_stateful (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -291,12 +291,12 @@ nm_setting_ppp_get_mppe_stateful (NMSettingPPP *setting) /** * nm_setting_ppp_get_crtscts: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:crtscts property of the setting + * Returns: the #NMSettingPpp:crtscts property of the setting **/ gboolean -nm_setting_ppp_get_crtscts (NMSettingPPP *setting) +nm_setting_ppp_get_crtscts (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), FALSE); @@ -305,12 +305,12 @@ nm_setting_ppp_get_crtscts (NMSettingPPP *setting) /** * nm_setting_ppp_get_baud: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:baud property of the setting + * Returns: the #NMSettingPpp:baud property of the setting **/ guint32 -nm_setting_ppp_get_baud (NMSettingPPP *setting) +nm_setting_ppp_get_baud (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); @@ -319,12 +319,12 @@ nm_setting_ppp_get_baud (NMSettingPPP *setting) /** * nm_setting_ppp_get_mru: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:mru property of the setting + * Returns: the #NMSettingPpp:mru property of the setting **/ guint32 -nm_setting_ppp_get_mru (NMSettingPPP *setting) +nm_setting_ppp_get_mru (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); @@ -333,12 +333,12 @@ nm_setting_ppp_get_mru (NMSettingPPP *setting) /** * nm_setting_ppp_get_mtu: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:mtu property of the setting + * Returns: the #NMSettingPpp:mtu property of the setting **/ guint32 -nm_setting_ppp_get_mtu (NMSettingPPP *setting) +nm_setting_ppp_get_mtu (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); @@ -347,12 +347,12 @@ nm_setting_ppp_get_mtu (NMSettingPPP *setting) /** * nm_setting_ppp_get_lcp_echo_failure: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:lcp-echo-failure property of the setting + * Returns: the #NMSettingPpp:lcp-echo-failure property of the setting **/ guint32 -nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting) +nm_setting_ppp_get_lcp_echo_failure (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); @@ -361,12 +361,12 @@ nm_setting_ppp_get_lcp_echo_failure (NMSettingPPP *setting) /** * nm_setting_ppp_get_lcp_echo_interval: - * @setting: the #NMSettingPPP + * @setting: the #NMSettingPpp * - * Returns: the #NMSettingPPP:lcp-echo-interval property of the setting + * Returns: the #NMSettingPpp:lcp-echo-interval property of the setting **/ guint32 -nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting) +nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting) { g_return_val_if_fail (NM_IS_SETTING_PPP (setting), 0); @@ -376,7 +376,7 @@ nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting) static gboolean verify (NMSetting *setting, GSList *all_settings, GError **error) { - NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting); + NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (setting); /* FIXME: Do we even want this or can we just let pppd evaluate the options? */ if (priv->mru > 0) { @@ -408,7 +408,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) } static void -nm_setting_ppp_init (NMSettingPPP *setting) +nm_setting_ppp_init (NMSettingPpp *setting) { } @@ -416,7 +416,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingPPPPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object); + NMSettingPppPrivate *priv = NM_SETTING_PPP_GET_PRIVATE (object); switch (prop_id) { case PROP_NOAUTH: @@ -483,7 +483,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingPPP *setting = NM_SETTING_PPP (object); + NMSettingPpp *setting = NM_SETTING_PPP (object); switch (prop_id) { case PROP_NOAUTH: @@ -547,12 +547,12 @@ get_property (GObject *object, guint prop_id, } static void -nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) +nm_setting_ppp_class_init (NMSettingPppClass *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 (NMSettingPPPPrivate)); + g_type_class_add_private (setting_class, sizeof (NMSettingPppPrivate)); /* virtual methods */ object_class->set_property = set_property; @@ -561,7 +561,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) /* Properties */ /** - * NMSettingPPP:noauth: + * NMSettingPpp:noauth: * * If %TRUE, do not require the other side (usually the PPP server) to * authenticate itself to the client. If %FALSE, require authentication @@ -576,7 +576,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:refuse-eap: + * NMSettingPpp:refuse-eap: * * If %TRUE, the EAP authentication method will not be used. **/ @@ -589,7 +589,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:refuse-pap: + * NMSettingPpp:refuse-pap: * * If %TRUE, the PAP authentication method will not be used. **/ @@ -602,7 +602,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:refuse-chap: + * NMSettingPpp:refuse-chap: * * If %TRUE, the CHAP authentication method will not be used. **/ @@ -615,7 +615,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:refuse-mschap: + * NMSettingPpp:refuse-mschap: * * If %TRUE, the MSCHAP authentication method will not be used. **/ @@ -628,7 +628,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:refuse-mschapv2: + * NMSettingPpp:refuse-mschapv2: * * If %TRUE, the MSCHAPv2 authentication method will not be used. **/ @@ -641,7 +641,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:nobsdcomp: + * NMSettingPpp:nobsdcomp: * * If %TRUE, BSD compression will not be requested. **/ @@ -655,7 +655,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:nodeflate: + * NMSettingPpp:nodeflate: * * If %TRUE, "deflate" compression will not be requested. **/ @@ -669,7 +669,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:no-vj-comp: + * NMSettingPpp:no-vj-comp: * * If %TRUE, Van Jacobsen TCP header compression will not be requested. **/ @@ -683,7 +683,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:require-mppe: + * NMSettingPpp:require-mppe: * * If %TRUE, MPPE (Microsoft Point-to-Point Encrpytion) will be required for * the PPP session. If either 64-bit or 128-bit MPPE is not available the @@ -699,7 +699,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:require-mppe-128: + * NMSettingPpp:require-mppe-128: * * If %TRUE, 128-bit MPPE (Microsoft Point-to-Point Encrpytion) will be * required for the PPP session, and the "require-mppe" property must also @@ -713,7 +713,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:mppe-stateful: + * NMSettingPpp:mppe-stateful: * * If %TRUE, stateful MPPE is used. See pppd documentation for more * information on stateful MPPE. @@ -727,7 +727,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:crtscts: + * NMSettingPpp:crtscts: * * If %TRUE, specify that pppd should set the serial port to use hardware * flow control with RTS and CTS signals. This value should normally be set @@ -742,7 +742,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:baud: + * NMSettingPpp:baud: * * If non-zero, instruct pppd to set the serial port to the specified * baudrate. This value should normally be left as 0 to automatically @@ -758,7 +758,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:mru: + * NMSettingPpp:mru: * * If non-zero, instruct pppd to request that the peer send packets no * larger than the specified size. If non-zero, the MRU should be between @@ -773,7 +773,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:mtu: + * NMSettingPpp:mtu: * * If non-zero, instruct pppd to send packets no larger than the specified * size. @@ -788,7 +788,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:lcp-echo-failure: + * NMSettingPpp:lcp-echo-failure: * * If non-zero, instruct pppd to presume the connection to the peer has * failed if the specified number of LCP echo-requests go unanswered by the @@ -805,7 +805,7 @@ nm_setting_ppp_class_init (NMSettingPPPClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingPPP:lcp-echo-interval: + * NMSettingPpp:lcp-echo-interval: * * If non-zero, instruct pppd to send an LCP echo-request frame to the peer * every n seconds (where n is the specified value). Note that some PPP diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h index 5733902b83..3b0956a892 100644 --- a/libnm-core/nm-setting-ppp.h +++ b/libnm-core/nm-setting-ppp.h @@ -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 diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c index a3923336c1..d12e077da4 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/libnm-core/nm-setting-pppoe.c @@ -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, diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h index 9d04af9e24..92c2d3361d 100644 --- a/libnm-core/nm-setting-pppoe.h +++ b/libnm-core/nm-setting-pppoe.h @@ -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)) #define NM_SETTING_PPPOE_SETTING_NAME "pppoe" /** - * NMSettingPPPOEError: + * NMSettingPppoeError: * @NM_SETTING_PPPOE_ERROR_UNKNOWN: unknown or unclassified error * @NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY: the property was invalid * @NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY: the property was missing and is @@ -50,7 +50,7 @@ typedef enum { NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, /*< nick=InvalidProperty >*/ NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY, /*< nick=MissingProperty >*/ NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING /*< nick=MissingPPPSetting >*/ -} NMSettingPPPOEError; +} NMSettingPppoeError; #define NM_SETTING_PPPOE_ERROR nm_setting_pppoe_error_quark () GQuark nm_setting_pppoe_error_quark (void); @@ -62,7 +62,7 @@ GQuark nm_setting_pppoe_error_quark (void); typedef struct { NMSetting parent; -} NMSettingPPPOE; +} NMSettingPppoe; typedef struct { NMSettingClass parent; @@ -72,15 +72,15 @@ typedef struct { void (*_reserved2) (void); void (*_reserved3) (void); void (*_reserved4) (void); -} NMSettingPPPOEClass; +} NMSettingPppoeClass; GType nm_setting_pppoe_get_type (void); NMSetting *nm_setting_pppoe_new (void); -const char *nm_setting_pppoe_get_service (NMSettingPPPOE *setting); -const char *nm_setting_pppoe_get_username (NMSettingPPPOE *setting); -const char *nm_setting_pppoe_get_password (NMSettingPPPOE *setting); -NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPPPOE *setting); +const char *nm_setting_pppoe_get_service (NMSettingPppoe *setting); +const char *nm_setting_pppoe_get_username (NMSettingPppoe *setting); +const char *nm_setting_pppoe_get_password (NMSettingPppoe *setting); +NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPppoe *setting); G_END_DECLS diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h index 44d46cf37a..67ebe1abe6 100644 --- a/libnm-core/nm-setting-serial.h +++ b/libnm-core/nm-setting-serial.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS * @NM_SETTING_SERIAL_ERROR_MISSING_PROPERTY: the property was missing and is * required * @NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING: one of the properties of the - * setting requires the connection to contain an #NMSettingPPP setting + * setting requires the connection to contain an #NMSettingPpp setting */ typedef enum { NM_SETTING_SERIAL_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index 3afc4dd93c..2366f17ee8 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -36,7 +36,7 @@ * @short_description: Describes connection properties for Virtual Private Networks * @include: nm-setting-vpn.h * - * The #NMSettingVPN object is a #NMSetting subclass that describes properties + * The #NMSettingVpn object is a #NMSetting subclass that describes properties * necessary for connection to Virtual Private Networks. NetworkManager uses * a plugin architecture to allow easier use of new VPN types, and this * setting abstracts the configuration for those plugins. Since the configuration @@ -48,9 +48,9 @@ /** * nm_setting_vpn_error_quark: * - * Registers an error quark for #NMSettingVPN if necessary. + * Registers an error quark for #NMSettingVpn if necessary. * - * Returns: the error quark used for #NMSettingVPN errors. + * Returns: the error quark used for #NMSettingVpn errors. **/ GQuark nm_setting_vpn_error_quark (void) @@ -63,14 +63,14 @@ nm_setting_vpn_error_quark (void) } -G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING, +G_DEFINE_TYPE_WITH_CODE (NMSettingVpn, nm_setting_vpn, NM_TYPE_SETTING, _nm_register_setting (NM_SETTING_VPN_SETTING_NAME, g_define_type_id, 1, NM_SETTING_VPN_ERROR)) NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_VPN) -#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVPNPrivate)) +#define NM_SETTING_VPN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_VPN, NMSettingVpnPrivate)) typedef struct { char *service_type; @@ -98,7 +98,7 @@ typedef struct { * freed with g_free(). Should contain secrets only. */ GHashTable *secrets; -} NMSettingVPNPrivate; +} NMSettingVpnPrivate; enum { PROP_0, @@ -113,9 +113,9 @@ enum { /** * nm_setting_vpn_new: * - * Creates a new #NMSettingVPN object with default values. + * Creates a new #NMSettingVpn object with default values. * - * Returns: (transfer full): the new empty #NMSettingVPN object + * Returns: (transfer full): the new empty #NMSettingVpn object **/ NMSetting * nm_setting_vpn_new (void) @@ -125,7 +125,7 @@ nm_setting_vpn_new (void) /** * nm_setting_vpn_get_service_type: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * * Returns the service name of the VPN, which identifies the specific VPN * plugin that should be used to connect to this VPN. @@ -133,7 +133,7 @@ nm_setting_vpn_new (void) * Returns: the VPN plugin's service name **/ const char * -nm_setting_vpn_get_service_type (NMSettingVPN *setting) +nm_setting_vpn_get_service_type (NMSettingVpn *setting) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); @@ -142,12 +142,12 @@ nm_setting_vpn_get_service_type (NMSettingVPN *setting) /** * nm_setting_vpn_get_user_name: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * - * Returns: the #NMSettingVPN:user-name property of the setting + * Returns: the #NMSettingVpn:user-name property of the setting **/ const char * -nm_setting_vpn_get_user_name (NMSettingVPN *setting) +nm_setting_vpn_get_user_name (NMSettingVpn *setting) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); @@ -156,14 +156,14 @@ nm_setting_vpn_get_user_name (NMSettingVPN *setting) /** * nm_setting_vpn_get_num_data_items: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * * Gets number of key/value pairs of VPN configuration data. * * Returns: the number of VPN plugin specific configuration data items **/ guint32 -nm_setting_vpn_get_num_data_items (NMSettingVPN *setting) +nm_setting_vpn_get_num_data_items (NMSettingVpn *setting) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), 0); @@ -172,7 +172,7 @@ nm_setting_vpn_get_num_data_items (NMSettingVPN *setting) /** * nm_setting_vpn_add_data_item: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: a name that uniquely identifies the given value @item * @item: the value to be referenced by @key * @@ -181,7 +181,7 @@ nm_setting_vpn_get_num_data_items (NMSettingVPN *setting) * or other secrets, which is what nm_setting_vpn_add_secret() is for. **/ void -nm_setting_vpn_add_data_item (NMSettingVPN *setting, +nm_setting_vpn_add_data_item (NMSettingVpn *setting, const char *key, const char *item) { @@ -198,7 +198,7 @@ nm_setting_vpn_add_data_item (NMSettingVPN *setting, /** * nm_setting_vpn_get_data_item: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: the name of the data item to retrieve * * Retrieves the data item of a key/value relationship previously established @@ -207,7 +207,7 @@ nm_setting_vpn_add_data_item (NMSettingVPN *setting, * Returns: the data item, if any **/ const char * -nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key) +nm_setting_vpn_get_data_item (NMSettingVpn *setting, const char *key) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); @@ -216,7 +216,7 @@ nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key) /** * nm_setting_vpn_remove_data_item: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: the name of the data item to remove * * Deletes a key/value relationship previously established by @@ -226,7 +226,7 @@ nm_setting_vpn_get_data_item (NMSettingVPN *setting, const char *key) * %FALSE if it was not. **/ gboolean -nm_setting_vpn_remove_data_item (NMSettingVPN *setting, const char *key) +nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key) { gboolean found; @@ -240,7 +240,7 @@ nm_setting_vpn_remove_data_item (NMSettingVPN *setting, const char *key) static void foreach_item_helper (GHashTable *hash, - NMVPNIterFunc func, + NMVpnIterFunc func, gpointer user_data) { GList *keys, *liter; @@ -269,7 +269,7 @@ foreach_item_helper (GHashTable *hash, /** * nm_setting_vpn_foreach_data_item: - * @setting: a #NMSettingVPN + * @setting: a #NMSettingVpn * @func: (scope call): an user provided function * @user_data: data to be passed to @func * @@ -278,8 +278,8 @@ foreach_item_helper (GHashTable *hash, * during iteration will not be part of the iteration. */ void -nm_setting_vpn_foreach_data_item (NMSettingVPN *setting, - NMVPNIterFunc func, +nm_setting_vpn_foreach_data_item (NMSettingVpn *setting, + NMVpnIterFunc func, gpointer user_data) { g_return_if_fail (NM_IS_SETTING_VPN (setting)); @@ -289,14 +289,14 @@ nm_setting_vpn_foreach_data_item (NMSettingVPN *setting, /** * nm_setting_vpn_get_num_secrets: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * * Gets number of VPN plugin specific secrets in the setting. * * Returns: the number of VPN plugin specific secrets **/ guint32 -nm_setting_vpn_get_num_secrets (NMSettingVPN *setting) +nm_setting_vpn_get_num_secrets (NMSettingVpn *setting) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), 0); @@ -305,7 +305,7 @@ nm_setting_vpn_get_num_secrets (NMSettingVPN *setting) /** * nm_setting_vpn_add_secret: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: a name that uniquely identifies the given secret @secret * @secret: the secret to be referenced by @key * @@ -313,7 +313,7 @@ nm_setting_vpn_get_num_secrets (NMSettingVPN *setting) * setting which may be retrieved later. **/ void -nm_setting_vpn_add_secret (NMSettingVPN *setting, +nm_setting_vpn_add_secret (NMSettingVpn *setting, const char *key, const char *secret) { @@ -330,7 +330,7 @@ nm_setting_vpn_add_secret (NMSettingVPN *setting, /** * nm_setting_vpn_get_secret: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: the name of the secret to retrieve * * Retrieves the secret of a key/value relationship previously established @@ -339,7 +339,7 @@ nm_setting_vpn_add_secret (NMSettingVPN *setting, * Returns: the secret, if any **/ const char * -nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key) +nm_setting_vpn_get_secret (NMSettingVpn *setting, const char *key) { g_return_val_if_fail (NM_IS_SETTING_VPN (setting), NULL); @@ -348,7 +348,7 @@ nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key) /** * nm_setting_vpn_remove_secret: - * @setting: the #NMSettingVPN + * @setting: the #NMSettingVpn * @key: the name of the secret to remove * * Deletes a key/value relationship previously established by @@ -358,7 +358,7 @@ nm_setting_vpn_get_secret (NMSettingVPN *setting, const char *key) * %FALSE if it was not. **/ gboolean -nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key) +nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key) { gboolean found; @@ -372,7 +372,7 @@ nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key) /** * nm_setting_vpn_foreach_secret: - * @setting: a #NMSettingVPN + * @setting: a #NMSettingVpn * @func: (scope call): an user provided function * @user_data: data to be passed to @func * @@ -381,8 +381,8 @@ nm_setting_vpn_remove_secret (NMSettingVPN *setting, const char *key) * iteration will not be part of the iteration. */ void -nm_setting_vpn_foreach_secret (NMSettingVPN *setting, - NMVPNIterFunc func, +nm_setting_vpn_foreach_secret (NMSettingVpn *setting, + NMVpnIterFunc func, gpointer user_data) { g_return_if_fail (NM_IS_SETTING_VPN (setting)); @@ -393,7 +393,7 @@ nm_setting_vpn_foreach_secret (NMSettingVPN *setting, static gboolean verify (NMSetting *setting, GSList *all_settings, GError **error) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); if (!priv->service_type) { g_set_error_literal (error, @@ -432,7 +432,7 @@ update_secret_string (NMSetting *setting, const char *value, GError **error) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); g_return_val_if_fail (key != NULL, NM_SETTING_UPDATE_SECRET_ERROR); g_return_val_if_fail (value != NULL, NM_SETTING_UPDATE_SECRET_ERROR); @@ -456,7 +456,7 @@ update_secret_hash (NMSetting *setting, GHashTable *secrets, GError **error) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); GHashTableIter iter; const char *name, *value; NMSettingUpdateSecretResult result = NM_SETTING_UPDATE_SECRET_SUCCESS_UNCHANGED; @@ -540,7 +540,7 @@ get_secret_flags (NMSetting *setting, NMSettingSecretFlags *out_flags, GError **error) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); gboolean success = FALSE; char *flags_key; gpointer val; @@ -593,8 +593,8 @@ need_secrets (NMSetting *setting) } static gboolean -compare_one_secret (NMSettingVPN *a, - NMSettingVPN *b, +compare_one_secret (NMSettingVpn *a, + NMSettingVpn *b, NMSettingCompareFlags flags) { GHashTable *a_secrets, *b_secrets; @@ -660,7 +660,7 @@ clear_secrets_with_flags (NMSetting *setting, NMSettingClearSecretsWithFlagsFn func, gpointer user_data) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); GHashTableIter iter; const char *secret; gboolean changed = TRUE; @@ -697,9 +697,9 @@ destroy_one_secret (gpointer data) } static void -nm_setting_vpn_init (NMSettingVPN *setting) +nm_setting_vpn_init (NMSettingVpn *setting) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); priv->data = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); priv->secrets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, destroy_one_secret); @@ -708,7 +708,7 @@ nm_setting_vpn_init (NMSettingVPN *setting) static void finalize (GObject *object) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object); g_free (priv->service_type); g_free (priv->user_name); @@ -730,7 +730,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (object); GHashTable *new_hash; switch (prop_id) { @@ -766,8 +766,8 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMSettingVPN *setting = NM_SETTING_VPN (object); - NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); + NMSettingVpn *setting = NM_SETTING_VPN (object); + NMSettingVpnPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); switch (prop_id) { case PROP_SERVICE_TYPE: @@ -789,12 +789,12 @@ get_property (GObject *object, guint prop_id, } static void -nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) +nm_setting_vpn_class_init (NMSettingVpnClass *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 (NMSettingVPNPrivate)); + g_type_class_add_private (setting_class, sizeof (NMSettingVpnPrivate)); /* virtual methods */ object_class->set_property = set_property; @@ -811,7 +811,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) /* Properties */ /** - * NMSettingVPN:service-type: + * NMSettingVpn:service-type: * * D-Bus service name of the VPN plugin that this setting uses to connect to * its network. i.e. org.freedesktop.NetworkManager.vpnc for the vpnc @@ -825,7 +825,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingVPN:user-name: + * NMSettingVpn:user-name: * * If the VPN connection requires a user name for authentication, that name * should be provided here. If the connection is available to more than one @@ -842,7 +842,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingVPN:data: + * NMSettingVpn:data: * * Dictionary of key/value pairs of VPN plugin specific data. Both keys and * values must be strings. @@ -855,7 +855,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) G_PARAM_STATIC_STRINGS)); /** - * NMSettingVPN:secrets: + * NMSettingVpn:secrets: * * Dictionary of key/value pairs of VPN plugin specific secrets like * passwords or private keys. Both keys and values must be strings. diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h index 3eb51ee9d6..b5a44c0d29 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/libnm-core/nm-setting-vpn.h @@ -28,11 +28,11 @@ G_BEGIN_DECLS #define NM_TYPE_SETTING_VPN (nm_setting_vpn_get_type ()) -#define NM_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVPN)) -#define NM_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVPNClass)) +#define NM_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_VPN, NMSettingVpn)) +#define NM_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_VPN, NMSettingVpnClass)) #define NM_IS_SETTING_VPN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_VPN)) #define NM_IS_SETTING_VPN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_VPN)) -#define NM_SETTING_VPN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVPNClass)) +#define NM_SETTING_VPN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_VPN, NMSettingVpnClass)) #define NM_SETTING_VPN_SETTING_NAME "vpn" @@ -59,7 +59,7 @@ GQuark nm_setting_vpn_error_quark (void); typedef struct { NMSetting parent; -} NMSettingVPN; +} NMSettingVpn; typedef struct { NMSettingClass parent; @@ -69,45 +69,45 @@ typedef struct { void (*_reserved2) (void); void (*_reserved3) (void); void (*_reserved4) (void); -} NMSettingVPNClass; +} NMSettingVpnClass; /** - * NMVPNIterFunc: + * NMVpnIterFunc: * @key: the name of the data or secret item * @value: the value of the data or secret item * @user_data: User data passed to nm_setting_vpn_foreach_data_item() or * nm_setting_vpn_foreach_secret() **/ -typedef void (*NMVPNIterFunc) (const char *key, const char *value, gpointer user_data); +typedef void (*NMVpnIterFunc) (const char *key, const char *value, gpointer user_data); GType nm_setting_vpn_get_type (void); NMSetting *nm_setting_vpn_new (void); -const char *nm_setting_vpn_get_service_type (NMSettingVPN *setting); -const char *nm_setting_vpn_get_user_name (NMSettingVPN *setting); +const char *nm_setting_vpn_get_service_type (NMSettingVpn *setting); +const char *nm_setting_vpn_get_user_name (NMSettingVpn *setting); -guint32 nm_setting_vpn_get_num_data_items (NMSettingVPN *setting); -void nm_setting_vpn_add_data_item (NMSettingVPN *setting, +guint32 nm_setting_vpn_get_num_data_items (NMSettingVpn *setting); +void nm_setting_vpn_add_data_item (NMSettingVpn *setting, const char *key, const char *item); -const char * nm_setting_vpn_get_data_item (NMSettingVPN *setting, +const char * nm_setting_vpn_get_data_item (NMSettingVpn *setting, const char *key); -gboolean nm_setting_vpn_remove_data_item (NMSettingVPN *setting, +gboolean nm_setting_vpn_remove_data_item (NMSettingVpn *setting, const char *key); -void nm_setting_vpn_foreach_data_item (NMSettingVPN *setting, - NMVPNIterFunc func, +void nm_setting_vpn_foreach_data_item (NMSettingVpn *setting, + NMVpnIterFunc func, gpointer user_data); -guint32 nm_setting_vpn_get_num_secrets (NMSettingVPN *setting); -void nm_setting_vpn_add_secret (NMSettingVPN *setting, +guint32 nm_setting_vpn_get_num_secrets (NMSettingVpn *setting); +void nm_setting_vpn_add_secret (NMSettingVpn *setting, const char *key, const char *secret); -const char * nm_setting_vpn_get_secret (NMSettingVPN *setting, +const char * nm_setting_vpn_get_secret (NMSettingVpn *setting, const char *key); -gboolean nm_setting_vpn_remove_secret (NMSettingVPN *setting, +gboolean nm_setting_vpn_remove_secret (NMSettingVpn *setting, const char *key); -void nm_setting_vpn_foreach_secret (NMSettingVPN *setting, - NMVPNIterFunc func, +void nm_setting_vpn_foreach_secret (NMSettingVpn *setting, + NMVpnIterFunc func, gpointer user_data); G_END_DECLS diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index ba965451d2..0ec1488cfa 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -90,9 +90,9 @@ vpn_check_empty_func (const char *key, const char *value, gpointer user_data) static void test_setting_vpn_items (void) { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; - s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); + s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); ASSERT (s_vpn != NULL, "vpn-items", "error creating vpn setting"); @@ -182,7 +182,7 @@ static void test_setting_vpn_update_secrets (void) { NMConnection *connection; - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; GHashTable *settings, *vpn, *secrets; GValue val = G_VALUE_INIT; gboolean success; @@ -198,7 +198,7 @@ test_setting_vpn_update_secrets (void) "vpn-update-secrets", "error creating connection"); - s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); + s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); ASSERT (s_vpn != NULL, "vpn-update-secrets", "error creating vpn setting"); @@ -240,7 +240,7 @@ test_setting_vpn_update_secrets (void) #define TO_DEL_NUM 50 typedef struct { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; char *to_del[TO_DEL_NUM]; guint called; } IterInfo; @@ -267,12 +267,12 @@ del_iter_func (const char *key, const char *value, gpointer user_data) static void test_setting_vpn_modify_during_foreach (void) { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; IterInfo info; char *key, *val; int i, u = 0; - s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); + s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); g_assert (s_vpn); for (i = 0; i < TO_DEL_NUM * 2; i++) { @@ -2291,7 +2291,7 @@ test_setting_vpn_changed_signal (void) { NMConnection *connection; gboolean changed = FALSE; - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; connection = nm_connection_new (); g_signal_connect (connection, @@ -2299,7 +2299,7 @@ test_setting_vpn_changed_signal (void) (GCallback) test_connection_changed_cb, &changed); - s_vpn = (NMSettingVPN *) nm_setting_vpn_new (); + s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); nm_connection_add_setting (connection, NM_SETTING (s_vpn)); ASSERT_CHANGED (nm_setting_vpn_add_data_item (s_vpn, "foobar", "baz")); diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index 6e67bdcfe0..b1a06a4abd 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -59,10 +59,10 @@ typedef struct { NMActiveConnectionState state; gboolean is_default; NMIP4Config *ip4_config; - NMDHCP4Config *dhcp4_config; + NMDhcp4Config *dhcp4_config; gboolean is_default6; NMIP6Config *ip6_config; - NMDHCP6Config *dhcp6_config; + NMDhcp6Config *dhcp6_config; gboolean is_vpn; char *master; } NMActiveConnectionPrivate; @@ -124,7 +124,7 @@ _nm_active_connection_type_for_path (DBusGConnection *connection, return G_TYPE_INVALID; } - /* Have to create an NMVPNConnection if it's a VPN connection, otherwise + /* Have to create an NMVpnConnection if it's a VPN connection, otherwise * a plain NMActiveConnection. */ if (dbus_g_proxy_call (proxy, @@ -372,14 +372,14 @@ nm_active_connection_get_ip4_config (NMActiveConnection *connection) * nm_active_connection_get_dhcp4_config: * @connection: an #NMActiveConnection * - * Gets the current #NMDHCP4Config (if any) associated with the + * Gets the current #NMDhcp4Config (if any) associated with the * #NMActiveConnection. * - * Returns: (transfer none): the #NMDHCP4Config, or %NULL if the + * Returns: (transfer none): the #NMDhcp4Config, or %NULL if the * connection does not use DHCP, or is not in the * %NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. **/ -NMDHCP4Config * +NMDhcp4Config * nm_active_connection_get_dhcp4_config (NMActiveConnection *connection) { g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (connection), NULL); @@ -429,14 +429,14 @@ nm_active_connection_get_ip6_config (NMActiveConnection *connection) * nm_active_connection_get_dhcp6_config: * @connection: an #NMActiveConnection * - * Gets the current #NMDHCP6Config (if any) associated with the + * Gets the current #NMDhcp6Config (if any) associated with the * #NMActiveConnection. * - * Returns: (transfer none): the #NMDHCP6Config, or %NULL if the + * Returns: (transfer none): the #NMDhcp6Config, or %NULL if the * connection does not use DHCPv6, or is not in the * %NM_ACTIVE_CONNECTION_STATE_ACTIVATED state. **/ -NMDHCP6Config * +NMDhcp6Config * nm_active_connection_get_dhcp6_config (NMActiveConnection *connection) { g_return_val_if_fail (NM_IS_ACTIVE_CONNECTION (connection), NULL); @@ -752,7 +752,7 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class) /** * NMActiveConnection:dhcp4-config: * - * The #NMDHCP4Config of the connection. + * The #NMDhcp4Config of the connection. **/ g_object_class_install_property (object_class, PROP_DHCP4_CONFIG, @@ -788,7 +788,7 @@ nm_active_connection_class_init (NMActiveConnectionClass *ap_class) /** * NMActiveConnection:dhcp6-config: * - * The #NMDHCP6Config of the connection. + * The #NMDhcp6Config of the connection. **/ g_object_class_install_property (object_class, PROP_DHCP6_CONFIG, diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h index e97d42b93d..9c429c1ba8 100644 --- a/libnm/nm-active-connection.h +++ b/libnm/nm-active-connection.h @@ -87,10 +87,10 @@ NMActiveConnectionState nm_active_connection_get_state (NMActiveConnection *c const char * nm_active_connection_get_master (NMActiveConnection *connection); gboolean nm_active_connection_get_default (NMActiveConnection *connection); NMIP4Config * nm_active_connection_get_ip4_config (NMActiveConnection *connection); -NMDHCP4Config *nm_active_connection_get_dhcp4_config (NMActiveConnection *connection); +NMDhcp4Config *nm_active_connection_get_dhcp4_config (NMActiveConnection *connection); gboolean nm_active_connection_get_default6 (NMActiveConnection *connection); NMIP6Config * nm_active_connection_get_ip6_config (NMActiveConnection *connection); -NMDHCP6Config *nm_active_connection_get_dhcp6_config (NMActiveConnection *connection); +NMDhcp6Config *nm_active_connection_get_dhcp6_config (NMActiveConnection *connection); gboolean nm_active_connection_get_vpn (NMActiveConnection *connection); G_END_DECLS diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 4c8484b999..e65d8e60e4 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -82,9 +82,9 @@ typedef struct { gboolean firmware_missing; gboolean autoconnect; NMIP4Config *ip4_config; - NMDHCP4Config *dhcp4_config; + NMDhcp4Config *dhcp4_config; NMIP6Config *ip6_config; - NMDHCP6Config *dhcp6_config; + NMDhcp6Config *dhcp6_config; NMDeviceState state; NMDeviceState last_seen_state; NMDeviceStateReason reason; @@ -694,7 +694,7 @@ nm_device_class_init (NMDeviceClass *device_class) /** * NMDevice:dhcp4-config: * - * The #NMDHCP4Config of the device. + * The #NMDhcp4Config of the device. **/ g_object_class_install_property (object_class, PROP_DHCP4_CONFIG, @@ -718,7 +718,7 @@ nm_device_class_init (NMDeviceClass *device_class) /** * NMDevice:dhcp6-config: * - * The #NMDHCP6Config of the device. + * The #NMDhcp6Config of the device. **/ g_object_class_install_property (object_class, PROP_DHCP6_CONFIG, @@ -1287,16 +1287,16 @@ nm_device_get_ip4_config (NMDevice *device) * nm_device_get_dhcp4_config: * @device: a #NMDevice * - * Gets the current #NMDHCP4Config associated with the #NMDevice. + * Gets the current #NMDhcp4Config associated with the #NMDevice. * * Note that as of NetworkManager 0.9.10, you can alternatively use * nm_active_connection_get_dhcp4_config(), which also works with VPN * connections. * - * Returns: (transfer none): the #NMDHCP4Config or %NULL if the device is not activated or not + * Returns: (transfer none): the #NMDhcp4Config or %NULL if the device is not activated or not * using DHCP. **/ -NMDHCP4Config * +NMDhcp4Config * nm_device_get_dhcp4_config (NMDevice *device) { g_return_val_if_fail (NM_IS_DEVICE (device), NULL); @@ -1330,16 +1330,16 @@ nm_device_get_ip6_config (NMDevice *device) * nm_device_get_dhcp6_config: * @device: a #NMDevice * - * Gets the current #NMDHCP6Config associated with the #NMDevice. + * Gets the current #NMDhcp6Config associated with the #NMDevice. * * Note that as of NetworkManager 0.9.10, you can alternatively use * nm_active_connection_get_dhcp6_config(), which also works with VPN * connections. * - * Returns: (transfer none): the #NMDHCP6Config or %NULL if the device is not activated or not + * Returns: (transfer none): the #NMDhcp6Config or %NULL if the device is not activated or not * using DHCP. **/ -NMDHCP6Config * +NMDhcp6Config * nm_device_get_dhcp6_config (NMDevice *device) { g_return_val_if_fail (NM_IS_DEVICE (device), NULL); diff --git a/libnm/nm-device.h b/libnm/nm-device.h index 9188deb19a..87d1e30e41 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -128,9 +128,9 @@ gboolean nm_device_get_autoconnect (NMDevice *device); void nm_device_set_autoconnect (NMDevice *device, gboolean autoconnect); gboolean nm_device_get_firmware_missing (NMDevice *device); NMIP4Config * nm_device_get_ip4_config (NMDevice *device); -NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *device); +NMDhcp4Config * nm_device_get_dhcp4_config (NMDevice *device); NMIP6Config * nm_device_get_ip6_config (NMDevice *device); -NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *device); +NMDhcp6Config * nm_device_get_dhcp6_config (NMDevice *device); NMDeviceState nm_device_get_state (NMDevice *device); NMDeviceState nm_device_get_state_reason (NMDevice *device, NMDeviceStateReason *reason); NMActiveConnection * nm_device_get_active_connection(NMDevice *device); diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c index 4fccee9034..96144b3b08 100644 --- a/libnm/nm-dhcp4-config.c +++ b/libnm/nm-dhcp4-config.c @@ -27,15 +27,15 @@ #include "nm-object-private.h" #include "nm-utils.h" -G_DEFINE_TYPE (NMDHCP4Config, nm_dhcp4_config, NM_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp4Config, nm_dhcp4_config, NM_TYPE_OBJECT) -#define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigPrivate)) +#define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigPrivate)) typedef struct { DBusGProxy *proxy; GHashTable *options; -} NMDHCP4ConfigPrivate; +} NMDhcp4ConfigPrivate; enum { PROP_0, @@ -45,14 +45,14 @@ enum { }; static void -nm_dhcp4_config_init (NMDHCP4Config *config) +nm_dhcp4_config_init (NMDhcp4Config *config) { } static gboolean demarshal_dhcp4_options (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); GHashTable *new_options; GHashTableIter iter; const char *key; @@ -72,9 +72,9 @@ demarshal_dhcp4_options (NMObject *object, GParamSpec *pspec, GValue *value, gpo } static void -register_properties (NMDHCP4Config *config) +register_properties (NMDhcp4Config *config) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (config); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (config); const NMPropertiesInfo property_info[] = { { NM_DHCP4_CONFIG_OPTIONS, &priv->options, demarshal_dhcp4_options }, { NULL }, @@ -88,7 +88,7 @@ register_properties (NMDHCP4Config *config) static void constructed (GObject *object) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); G_OBJECT_CLASS (nm_dhcp4_config_parent_class)->constructed (object); @@ -101,7 +101,7 @@ constructed (GObject *object) static void finalize (GObject *object) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); if (priv->options) g_hash_table_destroy (priv->options); @@ -117,7 +117,7 @@ get_property (GObject *object, GValue *value, GParamSpec *pspec) { - NMDHCP4Config *self = NM_DHCP4_CONFIG (object); + NMDhcp4Config *self = NM_DHCP4_CONFIG (object); _nm_object_ensure_inited (NM_OBJECT (object)); @@ -132,11 +132,11 @@ get_property (GObject *object, } static void -nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) +nm_dhcp4_config_class_init (NMDhcp4ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMDHCP4ConfigPrivate)); + g_type_class_add_private (config_class, sizeof (NMDhcp4ConfigPrivate)); /* virtual methods */ object_class->constructed = constructed; @@ -146,7 +146,7 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) /* properties */ /** - * NMDHCP4Config:options: + * NMDhcp4Config:options: * * The #GHashTable containing options of the configuration. * @@ -165,7 +165,7 @@ nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) * @connection: the #DBusGConnection * @object_path: the DBus object path of the device * - * Creates a new #NMDHCP4Config. + * Creates a new #NMDhcp4Config. * * Returns: (transfer full): a new configuration **/ @@ -180,7 +180,7 @@ nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path) /** * nm_dhcp4_config_get_options: - * @config: a #NMDHCP4Config + * @config: a #NMDhcp4Config * * Gets all the options contained in the configuration. * @@ -188,7 +188,7 @@ nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path) * This is the internal copy used by the configuration, and must not be modified. **/ GHashTable * -nm_dhcp4_config_get_options (NMDHCP4Config *config) +nm_dhcp4_config_get_options (NMDhcp4Config *config) { g_return_val_if_fail (NM_IS_DHCP4_CONFIG (config), NULL); @@ -198,7 +198,7 @@ nm_dhcp4_config_get_options (NMDHCP4Config *config) /** * nm_dhcp4_config_get_one_option: - * @config: a #NMDHCP4Config + * @config: a #NMDhcp4Config * @option: the option to retrieve * * Gets one option by option name. @@ -207,7 +207,7 @@ nm_dhcp4_config_get_options (NMDHCP4Config *config) * configuration, and must not be modified. **/ const char * -nm_dhcp4_config_get_one_option (NMDHCP4Config *config, const char *option) +nm_dhcp4_config_get_one_option (NMDhcp4Config *config, const char *option) { g_return_val_if_fail (NM_IS_DHCP4_CONFIG (config), NULL); diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h index c64e9a9c8d..996cdd133b 100644 --- a/libnm/nm-dhcp4-config.h +++ b/libnm/nm-dhcp4-config.h @@ -30,14 +30,14 @@ G_BEGIN_DECLS #define NM_TYPE_DHCP4_CONFIG (nm_dhcp4_config_get_type ()) -#define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config)) -#define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) +#define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDhcp4Config)) +#define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigClass)) #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) typedef struct { NMObject parent; -} NMDHCP4Config; +} NMDhcp4Config; typedef struct { NMObjectClass parent; @@ -49,7 +49,7 @@ typedef struct { void (*_reserved4) (void); void (*_reserved5) (void); void (*_reserved6) (void); -} NMDHCP4ConfigClass; +} NMDhcp4ConfigClass; #define NM_DHCP4_CONFIG_OPTIONS "options" @@ -57,9 +57,9 @@ GType nm_dhcp4_config_get_type (void); GObject *nm_dhcp4_config_new (DBusGConnection *connection, const char *object_path); -GHashTable * nm_dhcp4_config_get_options (NMDHCP4Config *config); +GHashTable * nm_dhcp4_config_get_options (NMDhcp4Config *config); -const char * nm_dhcp4_config_get_one_option (NMDHCP4Config *config, const char *option); +const char * nm_dhcp4_config_get_one_option (NMDhcp4Config *config, const char *option); G_END_DECLS diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c index 32cc3b4755..2f85186b48 100644 --- a/libnm/nm-dhcp6-config.c +++ b/libnm/nm-dhcp6-config.c @@ -27,15 +27,15 @@ #include "nm-object-private.h" #include "nm-utils.h" -G_DEFINE_TYPE (NMDHCP6Config, nm_dhcp6_config, NM_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_OBJECT) -#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigPrivate)) +#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigPrivate)) typedef struct { DBusGProxy *proxy; GHashTable *options; -} NMDHCP6ConfigPrivate; +} NMDhcp6ConfigPrivate; enum { PROP_0, @@ -45,14 +45,14 @@ enum { }; static void -nm_dhcp6_config_init (NMDHCP6Config *config) +nm_dhcp6_config_init (NMDhcp6Config *config) { } static gboolean demarshal_dhcp6_options (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); GHashTable *new_options; GHashTableIter iter; const char *key; @@ -72,9 +72,9 @@ demarshal_dhcp6_options (NMObject *object, GParamSpec *pspec, GValue *value, gpo } static void -register_properties (NMDHCP6Config *config) +register_properties (NMDhcp6Config *config) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (config); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (config); const NMPropertiesInfo property_info[] = { { NM_DHCP6_CONFIG_OPTIONS, &priv->options, demarshal_dhcp6_options }, { NULL }, @@ -88,7 +88,7 @@ register_properties (NMDHCP6Config *config) static void constructed (GObject *object) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); G_OBJECT_CLASS (nm_dhcp6_config_parent_class)->constructed (object); @@ -101,7 +101,7 @@ constructed (GObject *object) static void finalize (GObject *object) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); if (priv->options) g_hash_table_destroy (priv->options); @@ -117,7 +117,7 @@ get_property (GObject *object, GValue *value, GParamSpec *pspec) { - NMDHCP6Config *self = NM_DHCP6_CONFIG (object); + NMDhcp6Config *self = NM_DHCP6_CONFIG (object); _nm_object_ensure_inited (NM_OBJECT (object)); @@ -132,11 +132,11 @@ get_property (GObject *object, } static void -nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) +nm_dhcp6_config_class_init (NMDhcp6ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMDHCP6ConfigPrivate)); + g_type_class_add_private (config_class, sizeof (NMDhcp6ConfigPrivate)); /* virtual methods */ object_class->constructed = constructed; @@ -146,7 +146,7 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) /* properties */ /** - * NMDHCP6Config:options: + * NMDhcp6Config:options: * * The #GHashTable containing options of the configuration. * @@ -165,7 +165,7 @@ nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) * @connection: the #DBusGConnection * @object_path: the DBus object path of the device * - * Creates a new #NMDHCP6Config. + * Creates a new #NMDhcp6Config. * * Returns: (transfer full): a new configuration **/ @@ -180,7 +180,7 @@ nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path) /** * nm_dhcp6_config_get_options: - * @config: a #NMDHCP6Config + * @config: a #NMDhcp6Config * * Gets all the options contained in the configuration. * @@ -188,7 +188,7 @@ nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path) * This is the internal copy used by the configuration, and must not be modified. **/ GHashTable * -nm_dhcp6_config_get_options (NMDHCP6Config *config) +nm_dhcp6_config_get_options (NMDhcp6Config *config) { g_return_val_if_fail (NM_IS_DHCP6_CONFIG (config), NULL); @@ -198,7 +198,7 @@ nm_dhcp6_config_get_options (NMDHCP6Config *config) /** * nm_dhcp6_config_get_one_option: - * @config: a #NMDHCP6Config + * @config: a #NMDhcp6Config * @option: the option to retrieve * * Gets one option by option name. @@ -207,7 +207,7 @@ nm_dhcp6_config_get_options (NMDHCP6Config *config) * configuration, and must not be modified. **/ const char * -nm_dhcp6_config_get_one_option (NMDHCP6Config *config, const char *option) +nm_dhcp6_config_get_one_option (NMDhcp6Config *config, const char *option) { g_return_val_if_fail (NM_IS_DHCP6_CONFIG (config), NULL); diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index 939b3fdbe4..2f21eed2d9 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -30,14 +30,14 @@ G_BEGIN_DECLS #define NM_TYPE_DHCP6_CONFIG (nm_dhcp6_config_get_type ()) -#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6Config)) -#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) +#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDhcp6Config)) +#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigClass)) #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) typedef struct { NMObject parent; -} NMDHCP6Config; +} NMDhcp6Config; typedef struct { NMObjectClass parent; @@ -49,7 +49,7 @@ typedef struct { void (*_reserved4) (void); void (*_reserved5) (void); void (*_reserved6) (void); -} NMDHCP6ConfigClass; +} NMDhcp6ConfigClass; #define NM_DHCP6_CONFIG_OPTIONS "options" @@ -57,9 +57,9 @@ GType nm_dhcp6_config_get_type (void); GObject *nm_dhcp6_config_new (DBusGConnection *connection, const char *object_path); -GHashTable * nm_dhcp6_config_get_options (NMDHCP6Config *config); +GHashTable * nm_dhcp6_config_get_options (NMDhcp6Config *config); -const char * nm_dhcp6_config_get_one_option (NMDHCP6Config *config, const char *option); +const char * nm_dhcp6_config_get_one_option (NMDhcp6Config *config, const char *option); G_END_DECLS diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index 689f58fd8d..9bde7de299 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -26,15 +26,15 @@ #include "nm-object-private.h" #include "nm-active-connection.h" -G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION) +G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION) -#define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVPNConnectionPrivate)) +#define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVpnConnectionPrivate)) typedef struct { DBusGProxy *proxy; char *banner; - NMVPNConnectionState vpn_state; -} NMVPNConnectionPrivate; + NMVpnConnectionState vpn_state; +} NMVpnConnectionPrivate; enum { PROP_0, @@ -58,7 +58,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; * @connection: the #DBusGConnection * @path: the DBus object path of the new connection * - * Creates a new #NMVPNConnection. + * Creates a new #NMVpnConnection. * * Returns: (transfer full): a new connection object **/ @@ -76,17 +76,17 @@ nm_vpn_connection_new (DBusGConnection *connection, const char *path) /** * nm_vpn_connection_get_banner: - * @vpn: a #NMVPNConnection + * @vpn: a #NMVpnConnection * - * Gets the VPN login banner of the active #NMVPNConnection. + * Gets the VPN login banner of the active #NMVpnConnection. * * Returns: the VPN login banner of the VPN connection. This is the internal * string used by the connection, and must not be modified. **/ const char * -nm_vpn_connection_get_banner (NMVPNConnection *vpn) +nm_vpn_connection_get_banner (NMVpnConnection *vpn) { - NMVPNConnectionPrivate *priv; + NMVpnConnectionPrivate *priv; g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NULL); @@ -103,14 +103,14 @@ nm_vpn_connection_get_banner (NMVPNConnection *vpn) /** * nm_vpn_connection_get_vpn_state: - * @vpn: a #NMVPNConnection + * @vpn: a #NMVpnConnection * - * Gets the current #NMVPNConnection state. + * Gets the current #NMVpnConnection state. * * Returns: the VPN state of the active VPN connection. **/ -NMVPNConnectionState -nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn) +NMVpnConnectionState +nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), NM_VPN_CONNECTION_STATE_UNKNOWN); @@ -120,12 +120,12 @@ nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn) static void vpn_state_changed_proxy (DBusGProxy *proxy, - NMVPNConnectionState vpn_state, - NMVPNConnectionStateReason reason, + NMVpnConnectionState vpn_state, + NMVpnConnectionStateReason reason, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); if (priv->vpn_state != vpn_state) { priv->vpn_state = vpn_state; @@ -137,17 +137,17 @@ vpn_state_changed_proxy (DBusGProxy *proxy, /*****************************************************************************/ static void -nm_vpn_connection_init (NMVPNConnection *connection) +nm_vpn_connection_init (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); priv->vpn_state = NM_VPN_CONNECTION_STATE_UNKNOWN; } static void -register_properties (NMVPNConnection *connection) +register_properties (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); const NMPropertiesInfo property_info[] = { { NM_VPN_CONNECTION_BANNER, &priv->banner }, { NM_VPN_CONNECTION_VPN_STATE, &priv->vpn_state }, @@ -162,7 +162,7 @@ register_properties (NMVPNConnection *connection) static void constructed (GObject *object) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); G_OBJECT_CLASS (nm_vpn_connection_parent_class)->constructed (object); @@ -185,7 +185,7 @@ constructed (GObject *object) static void finalize (GObject *object) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); g_free (priv->banner); g_object_unref (priv->proxy); @@ -199,7 +199,7 @@ get_property (GObject *object, GValue *value, GParamSpec *pspec) { - NMVPNConnection *self = NM_VPN_CONNECTION (object); + NMVpnConnection *self = NM_VPN_CONNECTION (object); _nm_object_ensure_inited (NM_OBJECT (object)); @@ -217,11 +217,11 @@ get_property (GObject *object, } static void -nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) +nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class) { GObjectClass *object_class = G_OBJECT_CLASS (connection_class); - g_type_class_add_private (connection_class, sizeof (NMVPNConnectionPrivate)); + g_type_class_add_private (connection_class, sizeof (NMVpnConnectionPrivate)); /* virtual methods */ object_class->constructed = constructed; @@ -231,7 +231,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) /* properties */ /** - * NMVPNConnection:vpn-state: + * NMVpnConnection:vpn-state: * * The VPN state of the active VPN connection. **/ @@ -245,7 +245,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) G_PARAM_STATIC_STRINGS)); /** - * NMVPNConnection:banner: + * NMVpnConnection:banner: * * The VPN login banner of the active VPN connection. **/ @@ -261,7 +261,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) g_signal_new ("vpn-state-changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed), + G_STRUCT_OFFSET (NMVpnConnectionClass, vpn_state_changed), NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 0495310f38..665244c6d3 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -31,26 +31,26 @@ G_BEGIN_DECLS #define NM_TYPE_VPN_CONNECTION (nm_vpn_connection_get_type ()) -#define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection)) -#define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) +#define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVpnConnection)) +#define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVpnConnectionClass)) #define NM_IS_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) #define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_CONNECTION)) -#define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) +#define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVpnConnectionClass)) #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" #define NM_VPN_CONNECTION_BANNER "banner" typedef struct { NMActiveConnection parent; -} NMVPNConnection; +} NMVpnConnection; typedef struct { NMActiveConnectionClass parent; /* Signals */ - void (*vpn_state_changed) (NMVPNConnection *connection, - NMVPNConnectionState state, - NMVPNConnectionStateReason reason); + void (*vpn_state_changed) (NMVpnConnection *connection, + NMVpnConnectionState state, + NMVpnConnectionStateReason reason); /* Padding for future expansion */ void (*_reserved1) (void); @@ -59,14 +59,14 @@ typedef struct { void (*_reserved4) (void); void (*_reserved5) (void); void (*_reserved6) (void); -} NMVPNConnectionClass; +} NMVpnConnectionClass; GType nm_vpn_connection_get_type (void); GObject * nm_vpn_connection_new (DBusGConnection *connection, const char *path); -NMVPNConnectionState nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn); -const char * nm_vpn_connection_get_banner (NMVPNConnection *vpn); +NMVpnConnectionState nm_vpn_connection_get_vpn_state (NMVpnConnection *vpn); +const char * nm_vpn_connection_get_banner (NMVpnConnection *vpn); G_END_DECLS diff --git a/libnm/nm-vpn-plugin-ui-interface.c b/libnm/nm-vpn-plugin-ui-interface.c index 71c374cb4e..9350b13eff 100644 --- a/libnm/nm-vpn-plugin-ui-interface.c +++ b/libnm/nm-vpn-plugin-ui-interface.c @@ -32,7 +32,7 @@ interface_init (gpointer g_iface) /* Properties */ /** - * NMVPNPluginUiInterface:name: + * NMVpnPluginUiInterface:name: * * Short display name of the VPN plugin. */ @@ -43,7 +43,7 @@ interface_init (gpointer g_iface) G_PARAM_STATIC_STRINGS)); /** - * NMVPNPluginUiInterface:desc: + * NMVpnPluginUiInterface:desc: * * Longer description of the VPN plugin. */ @@ -54,7 +54,7 @@ interface_init (gpointer g_iface) G_PARAM_STATIC_STRINGS)); /** - * NMVPNPluginUiInterface:service: + * NMVpnPluginUiInterface:service: * * D-Bus service name of the plugin's VPN service. */ diff --git a/libnm/nm-vpn-plugin.c b/libnm/nm-vpn-plugin.c index 6fca2099d0..f9e85a8918 100644 --- a/libnm/nm-vpn-plugin.c +++ b/libnm/nm-vpn-plugin.c @@ -27,40 +27,40 @@ #include "nm-connection.h" #include "nm-dbus-glib-types.h" -static gboolean impl_vpn_plugin_connect (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_connect (NMVpnPlugin *plugin, GHashTable *connection, GError **error); -static gboolean impl_vpn_plugin_connect_interactive (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_connect_interactive (NMVpnPlugin *plugin, GHashTable *connection, GHashTable *details, GError **error); -static gboolean impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_need_secrets (NMVpnPlugin *plugin, GHashTable *connection, char **service_name, GError **err); -static gboolean impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_new_secrets (NMVpnPlugin *plugin, GHashTable *connection, GError **err); -static gboolean impl_vpn_plugin_disconnect (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_disconnect (NMVpnPlugin *plugin, GError **err); -static gboolean impl_vpn_plugin_set_config (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_set_config (NMVpnPlugin *plugin, GHashTable *config, GError **err); -static gboolean impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_set_ip4_config (NMVpnPlugin *plugin, GHashTable *config, GError **err); -static gboolean impl_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_set_ip6_config (NMVpnPlugin *plugin, GHashTable *config, GError **err); -static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, +static gboolean impl_vpn_plugin_set_failure (NMVpnPlugin *plugin, char *reason, GError **err); @@ -68,10 +68,10 @@ static gboolean impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, #define NM_VPN_PLUGIN_QUIT_TIMER 20 -G_DEFINE_ABSTRACT_TYPE (NMVPNPlugin, nm_vpn_plugin, G_TYPE_OBJECT) +G_DEFINE_ABSTRACT_TYPE (NMVpnPlugin, nm_vpn_plugin, G_TYPE_OBJECT) typedef struct { - NMVPNServiceState state; + NMVpnServiceState state; /* DBUS-y stuff */ DBusGConnection *connection; @@ -89,9 +89,9 @@ typedef struct { /* Config stuff copied from config to ip4config */ GValue banner, tundev, gateway, mtu; -} NMVPNPluginPrivate; +} NMVpnPluginPrivate; -#define NM_VPN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_PLUGIN, NMVPNPluginPrivate)) +#define NM_VPN_PLUGIN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_PLUGIN, NMVpnPluginPrivate)) enum { STATE_CHANGED, @@ -132,10 +132,10 @@ nm_vpn_plugin_error_quark (void) static void -nm_vpn_plugin_set_connection (NMVPNPlugin *plugin, +nm_vpn_plugin_set_connection (NMVpnPlugin *plugin, DBusGConnection *connection) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); if (priv->connection) dbus_g_connection_unref (priv->connection); @@ -144,7 +144,7 @@ nm_vpn_plugin_set_connection (NMVPNPlugin *plugin, } DBusGConnection * -nm_vpn_plugin_get_connection (NMVPNPlugin *plugin) +nm_vpn_plugin_get_connection (NMVpnPlugin *plugin) { DBusGConnection *connection; @@ -158,8 +158,8 @@ nm_vpn_plugin_get_connection (NMVPNPlugin *plugin) return connection; } -NMVPNServiceState -nm_vpn_plugin_get_state (NMVPNPlugin *plugin) +NMVpnServiceState +nm_vpn_plugin_get_state (NMVpnPlugin *plugin) { g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), NM_VPN_SERVICE_STATE_UNKNOWN); @@ -167,10 +167,10 @@ nm_vpn_plugin_get_state (NMVPNPlugin *plugin) } void -nm_vpn_plugin_set_state (NMVPNPlugin *plugin, - NMVPNServiceState state) +nm_vpn_plugin_set_state (NMVpnPlugin *plugin, + NMVpnServiceState state) { - NMVPNPluginPrivate *priv; + NMVpnPluginPrivate *priv; g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); @@ -182,7 +182,7 @@ nm_vpn_plugin_set_state (NMVPNPlugin *plugin, } void -nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin, +nm_vpn_plugin_set_login_banner (NMVpnPlugin *plugin, const char *banner) { g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); @@ -192,8 +192,8 @@ nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin, } void -nm_vpn_plugin_failure (NMVPNPlugin *plugin, - NMVPNPluginFailure reason) +nm_vpn_plugin_failure (NMVpnPlugin *plugin, + NMVpnPluginFailure reason) { g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); @@ -201,10 +201,10 @@ nm_vpn_plugin_failure (NMVPNPlugin *plugin, } gboolean -nm_vpn_plugin_disconnect (NMVPNPlugin *plugin, GError **err) +nm_vpn_plugin_disconnect (NMVpnPlugin *plugin, GError **err) { gboolean ret = FALSE; - NMVPNServiceState state; + NMVpnServiceState state; g_return_val_if_fail (NM_IS_VPN_PLUGIN (plugin), FALSE); @@ -244,7 +244,7 @@ nm_vpn_plugin_disconnect (NMVPNPlugin *plugin, GError **err) } static void -nm_vpn_plugin_emit_quit (NMVPNPlugin *plugin) +nm_vpn_plugin_emit_quit (NMVpnPlugin *plugin) { g_signal_emit (plugin, signals[QUIT], 0); } @@ -252,7 +252,7 @@ nm_vpn_plugin_emit_quit (NMVPNPlugin *plugin) static gboolean connect_timer_expired (gpointer data) { - NMVPNPlugin *plugin = NM_VPN_PLUGIN (data); + NMVpnPlugin *plugin = NM_VPN_PLUGIN (data); GError *err = NULL; g_message ("Connect timer expired, disconnecting."); @@ -268,7 +268,7 @@ connect_timer_expired (gpointer data) static gboolean quit_timer_expired (gpointer data) { - NMVPNPlugin *plugin = NM_VPN_PLUGIN (data); + NMVpnPlugin *plugin = NM_VPN_PLUGIN (data); nm_vpn_plugin_emit_quit (plugin); @@ -278,16 +278,16 @@ quit_timer_expired (gpointer data) static gboolean fail_stop (gpointer data) { - NMVPNPlugin *plugin = NM_VPN_PLUGIN (data); + NMVpnPlugin *plugin = NM_VPN_PLUGIN (data); nm_vpn_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_STOPPED); return FALSE; } static void -schedule_fail_stop (NMVPNPlugin *plugin) +schedule_fail_stop (NMVpnPlugin *plugin) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); if (priv->fail_stop_id) g_source_remove (priv->fail_stop_id); @@ -309,10 +309,10 @@ _g_value_set (GValue *dst, GValue *src) } void -nm_vpn_plugin_set_config (NMVPNPlugin *plugin, +nm_vpn_plugin_set_config (NMVpnPlugin *plugin, GHashTable *config) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); GValue *val; g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); @@ -341,10 +341,10 @@ nm_vpn_plugin_set_config (NMVPNPlugin *plugin, } void -nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, +nm_vpn_plugin_set_ip4_config (NMVpnPlugin *plugin, GHashTable *ip4_config) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); GHashTable *combined_config; GHashTableIter iter; gpointer key, value; @@ -390,10 +390,10 @@ nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, } void -nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin, +nm_vpn_plugin_set_ip6_config (NMVpnPlugin *plugin, GHashTable *ip6_config) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); g_return_if_fail (NM_IS_VPN_PLUGIN (plugin)); g_return_if_fail (ip6_config != NULL); @@ -413,9 +413,9 @@ connect_timer_removed (gpointer data) } static void -connect_timer_start (NMVPNPlugin *plugin) +connect_timer_start (NMVpnPlugin *plugin) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); priv->connect_timer = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 60, @@ -425,13 +425,13 @@ connect_timer_start (NMVPNPlugin *plugin) } static gboolean -_connect_generic (NMVPNPlugin *plugin, +_connect_generic (NMVpnPlugin *plugin, GHashTable *properties, GHashTable *details, GError **error) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); - NMVPNPluginClass *vpn_class = NM_VPN_PLUGIN_GET_CLASS (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginClass *vpn_class = NM_VPN_PLUGIN_GET_CLASS (plugin); NMConnection *connection; gboolean success = FALSE; GError *local = NULL; @@ -484,7 +484,7 @@ _connect_generic (NMVPNPlugin *plugin, } static gboolean -impl_vpn_plugin_connect (NMVPNPlugin *plugin, +impl_vpn_plugin_connect (NMVpnPlugin *plugin, GHashTable *connection, GError **error) { @@ -492,7 +492,7 @@ impl_vpn_plugin_connect (NMVPNPlugin *plugin, } static gboolean -impl_vpn_plugin_connect_interactive (NMVPNPlugin *plugin, +impl_vpn_plugin_connect_interactive (NMVpnPlugin *plugin, GHashTable *connection, GHashTable *details, GError **error) @@ -503,7 +503,7 @@ impl_vpn_plugin_connect_interactive (NMVPNPlugin *plugin, /***************************************************************/ static gboolean -impl_vpn_plugin_need_secrets (NMVPNPlugin *plugin, +impl_vpn_plugin_need_secrets (NMVpnPlugin *plugin, GHashTable *properties, char **setting_name, GError **err) @@ -557,11 +557,11 @@ out: } static gboolean -impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin, +impl_vpn_plugin_new_secrets (NMVpnPlugin *plugin, GHashTable *properties, GError **error) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); NMConnection *connection; GError *local = NULL; gboolean success; @@ -606,7 +606,7 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin, /** * nm_vpn_plugin_secrets_required: - * @plugin: the #NMVPNPlugin + * @plugin: the #NMVpnPlugin * @message: an information message about why secrets are required, if any * @hints: VPN specific secret names for required new secrets * @@ -617,11 +617,11 @@ impl_vpn_plugin_new_secrets (NMVPNPlugin *plugin, * information to complete the request. */ void -nm_vpn_plugin_secrets_required (NMVPNPlugin *plugin, +nm_vpn_plugin_secrets_required (NMVpnPlugin *plugin, const char *message, const char **hints) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); /* Plugin must be able to accept the new secrets if it calls this method */ g_return_if_fail (NM_VPN_PLUGIN_GET_CLASS (plugin)->new_secrets); @@ -643,14 +643,14 @@ nm_vpn_plugin_secrets_required (NMVPNPlugin *plugin, /***************************************************************/ static gboolean -impl_vpn_plugin_disconnect (NMVPNPlugin *plugin, +impl_vpn_plugin_disconnect (NMVpnPlugin *plugin, GError **err) { return nm_vpn_plugin_disconnect (plugin, err); } static gboolean -impl_vpn_plugin_set_config (NMVPNPlugin *plugin, +impl_vpn_plugin_set_config (NMVpnPlugin *plugin, GHashTable *config, GError **err) { @@ -660,7 +660,7 @@ impl_vpn_plugin_set_config (NMVPNPlugin *plugin, } static gboolean -impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, +impl_vpn_plugin_set_ip4_config (NMVpnPlugin *plugin, GHashTable *config, GError **err) { @@ -670,7 +670,7 @@ impl_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, } static gboolean -impl_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin, +impl_vpn_plugin_set_ip6_config (NMVpnPlugin *plugin, GHashTable *config, GError **err) { @@ -680,7 +680,7 @@ impl_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin, } static gboolean -impl_vpn_plugin_set_failure (NMVPNPlugin *plugin, +impl_vpn_plugin_set_failure (NMVpnPlugin *plugin, char *reason, GError **err) { @@ -721,7 +721,7 @@ one_plugin_destroyed (gpointer data, } static void -nm_vpn_plugin_init (NMVPNPlugin *plugin) +nm_vpn_plugin_init (NMVpnPlugin *plugin) { active_plugins = g_slist_append (active_plugins, plugin); g_object_weak_ref (G_OBJECT (plugin), @@ -735,8 +735,8 @@ constructor (GType type, GObjectConstructParam *construct_params) { GObject *object; - NMVPNPlugin *plugin; - NMVPNPluginPrivate *priv; + NMVpnPlugin *plugin; + NMVpnPluginPrivate *priv; DBusGConnection *connection; DBusGProxy *proxy; guint request_name_result; @@ -800,7 +800,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); switch (prop_id) { case PROP_DBUS_SERVICE_NAME: @@ -809,7 +809,7 @@ set_property (GObject *object, guint prop_id, break; case PROP_STATE: nm_vpn_plugin_set_state (NM_VPN_PLUGIN (object), - (NMVPNServiceState) g_value_get_uint (value)); + (NMVpnServiceState) g_value_get_uint (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -821,7 +821,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (object); switch (prop_id) { case PROP_DBUS_SERVICE_NAME: @@ -839,9 +839,9 @@ get_property (GObject *object, guint prop_id, static void dispose (GObject *object) { - NMVPNPlugin *plugin = NM_VPN_PLUGIN (object); - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); - NMVPNServiceState state; + NMVpnPlugin *plugin = NM_VPN_PLUGIN (object); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnServiceState state; GError *err = NULL; if (priv->fail_stop_id) { @@ -866,8 +866,8 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMVPNPlugin *plugin = NM_VPN_PLUGIN (object); - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPlugin *plugin = NM_VPN_PLUGIN (object); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); nm_vpn_plugin_set_connection (plugin, NULL); g_free (priv->dbus_service_name); @@ -891,9 +891,9 @@ quit_timer_removed (gpointer data) } static void -state_changed (NMVPNPlugin *plugin, NMVPNServiceState state) +state_changed (NMVpnPlugin *plugin, NMVpnServiceState state) { - NMVPNPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); + NMVpnPluginPrivate *priv = NM_VPN_PLUGIN_GET_PRIVATE (plugin); switch (state) { case NM_VPN_SERVICE_STATE_STARTING: @@ -930,11 +930,11 @@ state_changed (NMVPNPlugin *plugin, NMVPNServiceState state) } static void -nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) +nm_vpn_plugin_class_init (NMVpnPluginClass *plugin_class) { GObjectClass *object_class = G_OBJECT_CLASS (plugin_class); - g_type_class_add_private (object_class, sizeof (NMVPNPluginPrivate)); + g_type_class_add_private (object_class, sizeof (NMVpnPluginPrivate)); dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (plugin_class), &dbus_glib_nm_vpn_plugin_object_info); @@ -951,7 +951,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) /* properties */ /** - * NMVPNPlugin:service-name: + * NMVpnPlugin:service-name: * * The D-Bus service name of this plugin. */ @@ -964,7 +964,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) G_PARAM_STATIC_STRINGS)); /** - * NMVPNPlugin:state: + * NMVpnPlugin:state: * * The state of the plugin. */ @@ -982,7 +982,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("state-changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, state_changed), + G_STRUCT_OFFSET (NMVpnPluginClass, state_changed), NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, @@ -1000,7 +1000,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("config", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, config), + G_STRUCT_OFFSET (NMVpnPluginClass, config), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, @@ -1010,7 +1010,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("ip4-config", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, ip4_config), + G_STRUCT_OFFSET (NMVpnPluginClass, ip4_config), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, @@ -1020,7 +1020,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("ip6-config", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, ip6_config), + G_STRUCT_OFFSET (NMVpnPluginClass, ip6_config), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, 1, @@ -1030,7 +1030,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("login-banner", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, login_banner), + G_STRUCT_OFFSET (NMVpnPluginClass, login_banner), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, @@ -1040,7 +1040,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("failure", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, failure), + G_STRUCT_OFFSET (NMVpnPluginClass, failure), NULL, NULL, g_cclosure_marshal_VOID__UINT, G_TYPE_NONE, 1, @@ -1050,7 +1050,7 @@ nm_vpn_plugin_class_init (NMVPNPluginClass *plugin_class) g_signal_new ("quit", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMVPNPluginClass, quit), + G_STRUCT_OFFSET (NMVpnPluginClass, quit), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0, diff --git a/libnm/nm-vpn-plugin.h b/libnm/nm-vpn-plugin.h index aa17dc06c1..1ee64e97cf 100644 --- a/libnm/nm-vpn-plugin.h +++ b/libnm/nm-vpn-plugin.h @@ -31,17 +31,17 @@ G_BEGIN_DECLS #define NM_TYPE_VPN_PLUGIN (nm_vpn_plugin_get_type ()) -#define NM_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN, NMVPNPlugin)) -#define NM_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN, NMVPNPluginClass)) +#define NM_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN, NMVpnPlugin)) +#define NM_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN, NMVpnPluginClass)) #define NM_IS_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN)) #define NM_IS_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_PLUGIN)) -#define NM_VPN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN, NMVPNPluginClass)) +#define NM_VPN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN, NMVpnPluginClass)) #define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name" #define NM_VPN_PLUGIN_STATE "state" /** - * NMVPNPluginError: + * NMVpnPluginError: * @NM_VPN_PLUGIN_ERROR_GENERAL: general failure * @NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: the plugin is already starting, * and another connect request was received @@ -78,57 +78,57 @@ typedef enum { NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, /*< nick=LaunchFailed >*/ NM_VPN_PLUGIN_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED /*< nick=InteractiveNotSupported >*/ -} NMVPNPluginError; +} NMVpnPluginError; #define NM_VPN_PLUGIN_ERROR (nm_vpn_plugin_error_quark ()) typedef struct { GObject parent; -} NMVPNPlugin; +} NMVpnPlugin; typedef struct { GObjectClass parent; /* virtual methods */ - gboolean (*connect) (NMVPNPlugin *plugin, + gboolean (*connect) (NMVpnPlugin *plugin, NMConnection *connection, GError **err); - gboolean (*need_secrets) (NMVPNPlugin *plugin, + gboolean (*need_secrets) (NMVpnPlugin *plugin, NMConnection *connection, char **setting_name, GError **error); - gboolean (*disconnect) (NMVPNPlugin *plugin, + gboolean (*disconnect) (NMVpnPlugin *plugin, GError **err); /* Signals */ - void (*state_changed) (NMVPNPlugin *plugin, - NMVPNServiceState state); + void (*state_changed) (NMVpnPlugin *plugin, + NMVpnServiceState state); - void (*ip4_config) (NMVPNPlugin *plugin, + void (*ip4_config) (NMVpnPlugin *plugin, GHashTable *ip4_config); - void (*login_banner) (NMVPNPlugin *plugin, + void (*login_banner) (NMVpnPlugin *plugin, const char *banner); - void (*failure) (NMVPNPlugin *plugin, - NMVPNPluginFailure reason); + void (*failure) (NMVpnPlugin *plugin, + NMVpnPluginFailure reason); - void (*quit) (NMVPNPlugin *plugin); + void (*quit) (NMVpnPlugin *plugin); - void (*config) (NMVPNPlugin *plugin, + void (*config) (NMVpnPlugin *plugin, GHashTable *config); - void (*ip6_config) (NMVPNPlugin *plugin, + void (*ip6_config) (NMVpnPlugin *plugin, GHashTable *config); /* more methods */ - gboolean (*new_secrets) (NMVPNPlugin *plugin, + gboolean (*new_secrets) (NMVpnPlugin *plugin, NMConnection *connection, GError **error); - gboolean (*connect_interactive) (NMVPNPlugin *plugin, + gboolean (*connect_interactive) (NMVpnPlugin *plugin, NMConnection *connection, GHashTable *details, GError **error); @@ -136,37 +136,37 @@ typedef struct { /* Padding for future expansion */ void (*_reserved1) (void); void (*_reserved2) (void); -} NMVPNPluginClass; +} NMVpnPluginClass; GType nm_vpn_plugin_get_type (void); GQuark nm_vpn_plugin_error_quark (void); GType nm_vpn_plugin_error_get_type (void); -DBusGConnection *nm_vpn_plugin_get_connection (NMVPNPlugin *plugin); -NMVPNServiceState nm_vpn_plugin_get_state (NMVPNPlugin *plugin); -void nm_vpn_plugin_set_state (NMVPNPlugin *plugin, - NMVPNServiceState state); +DBusGConnection *nm_vpn_plugin_get_connection (NMVpnPlugin *plugin); +NMVpnServiceState nm_vpn_plugin_get_state (NMVpnPlugin *plugin); +void nm_vpn_plugin_set_state (NMVpnPlugin *plugin, + NMVpnServiceState state); -void nm_vpn_plugin_secrets_required (NMVPNPlugin *plugin, +void nm_vpn_plugin_secrets_required (NMVpnPlugin *plugin, const char *message, const char **hints); -void nm_vpn_plugin_set_login_banner (NMVPNPlugin *plugin, +void nm_vpn_plugin_set_login_banner (NMVpnPlugin *plugin, const char *banner); -void nm_vpn_plugin_failure (NMVPNPlugin *plugin, - NMVPNPluginFailure reason); +void nm_vpn_plugin_failure (NMVpnPlugin *plugin, + NMVpnPluginFailure reason); -void nm_vpn_plugin_set_config (NMVPNPlugin *plugin, +void nm_vpn_plugin_set_config (NMVpnPlugin *plugin, GHashTable *config); -void nm_vpn_plugin_set_ip4_config (NMVPNPlugin *plugin, +void nm_vpn_plugin_set_ip4_config (NMVpnPlugin *plugin, GHashTable *ip4_config); -void nm_vpn_plugin_set_ip6_config (NMVPNPlugin *plugin, +void nm_vpn_plugin_set_ip6_config (NMVpnPlugin *plugin, GHashTable *ip6_config); -gboolean nm_vpn_plugin_disconnect (NMVPNPlugin *plugin, +gboolean nm_vpn_plugin_disconnect (NMVpnPlugin *plugin, GError **err); G_END_DECLS diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 17f77bc610..ab65a965a8 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -221,7 +221,7 @@ complete_connection (NMDevice *device, NMSettingGsm *s_gsm; NMSettingCdma *s_cdma; NMSettingSerial *s_serial; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; const char *format = NULL, *preferred = NULL; s_gsm = nm_connection_get_setting_gsm (connection); diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index ce9045d292..dbc83a657f 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1073,7 +1073,7 @@ pppoe_stage3_ip4_config_start (NMDeviceEthernet *self, NMDeviceStateReason *reas { NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self); NMConnection *connection; - NMSettingPPPOE *s_pppoe; + NMSettingPppoe *s_pppoe; NMActRequest *req; GError *err = NULL; NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; @@ -1466,7 +1466,7 @@ complete_connection (NMDevice *device, { NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device); NMSettingWired *s_wired; - NMSettingPPPOE *s_pppoe; + NMSettingPppoe *s_pppoe; const GByteArray *setting_mac; s_pppoe = nm_connection_get_setting_pppoe (connection); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 133e0dddcc..fbce831b51 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -253,9 +253,9 @@ typedef struct { NMIP4Config * wwan_ip4_config; /* WWAN configuration */ /* DHCPv4 tracking */ - NMDHCPClient * dhcp4_client; + NMDhcpClient * dhcp4_client; gulong dhcp4_state_sigid; - NMDHCP4Config * dhcp4_config; + NMDhcp4Config * dhcp4_config; NMIP4Config * vpn4_config; /* routes added by a VPN which uses this device */ guint arp_round2_id; @@ -290,10 +290,10 @@ typedef struct { GHashTable * ip6_saved_properties; - NMDHCPClient * dhcp6_client; + NMDhcpClient * dhcp6_client; NMRDiscDHCPLevel dhcp6_mode; gulong dhcp6_state_sigid; - NMDHCP6Config * dhcp6_config; + NMDhcp6Config * dhcp6_config; /* IP6 config from DHCP */ NMIP6Config * dhcp6_ip6_config; @@ -2683,7 +2683,7 @@ dhcp4_fail (NMDevice *self, gboolean timeout) } static void -dhcp4_update_config (NMDevice *self, NMDHCP4Config *config, GHashTable *options) +dhcp4_update_config (NMDevice *self, NMDhcp4Config *config, GHashTable *options) { GHashTableIter iter; const char *key, *value; @@ -2699,7 +2699,7 @@ dhcp4_update_config (NMDevice *self, NMDHCP4Config *config, GHashTable *options) } static void -dhcp4_state_changed (NMDHCPClient *client, +dhcp4_state_changed (NMDhcpClient *client, NMDhcpState state, NMIP4Config *ip4_config, GHashTable *options, @@ -3119,7 +3119,7 @@ dhcp6_fail (NMDevice *self, gboolean timeout) } static void -dhcp6_timeout (NMDevice *self, NMDHCPClient *client) +dhcp6_timeout (NMDevice *self, NMDhcpClient *client) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); @@ -3134,7 +3134,7 @@ dhcp6_timeout (NMDevice *self, NMDHCPClient *client) } static void -dhcp6_update_config (NMDevice *self, NMDHCP6Config *config, GHashTable *options) +dhcp6_update_config (NMDevice *self, NMDhcp6Config *config, GHashTable *options) { GHashTableIter iter; const char *key, *value; @@ -3150,7 +3150,7 @@ dhcp6_update_config (NMDevice *self, NMDHCP6Config *config, GHashTable *options) } static void -dhcp6_state_changed (NMDHCPClient *client, +dhcp6_state_changed (NMDhcpClient *client, NMDhcpState state, NMIP6Config *ip6_config, GHashTable *options, @@ -5023,7 +5023,7 @@ nm_device_is_activating (NMDevice *self) /* IP Configuration stuff */ -NMDHCP4Config * +NMDhcp4Config * nm_device_get_dhcp4_config (NMDevice *self) { g_return_val_if_fail (NM_IS_DEVICE (self), NULL); @@ -5282,7 +5282,7 @@ nm_device_set_wwan_ip6_config (NMDevice *self, NMIP6Config *config) _LOGW (LOGD_IP6, "failed to set WWAN IPv6 configuration"); } -NMDHCP6Config * +NMDhcp6Config * nm_device_get_dhcp6_config (NMDevice *self) { g_return_val_if_fail (NM_IS_DEVICE (self), NULL); diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index c4d0d3da11..95d6a5d861 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -237,8 +237,8 @@ int nm_device_get_priority (NMDevice *dev); const guint8 * nm_device_get_hw_address (NMDevice *dev, guint *out_len); -NMDHCP4Config * nm_device_get_dhcp4_config (NMDevice *dev); -NMDHCP6Config * nm_device_get_dhcp6_config (NMDevice *dev); +NMDhcp4Config * nm_device_get_dhcp4_config (NMDevice *dev); +NMDhcp6Config * nm_device_get_dhcp6_config (NMDevice *dev); NMIP4Config * nm_device_get_ip4_config (NMDevice *dev); void nm_device_set_vpn4_config (NMDevice *dev, NMIP4Config *config); diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 5dd315ea37..bdabc76815 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -267,7 +267,7 @@ create_gsm_connect_properties (NMModem *modem, GError **error) { NMSettingGsm *setting; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; MMSimpleConnectProperties *properties; const gchar *str; NMModemIPType ip_type; @@ -444,14 +444,14 @@ complete_connection (NMModem *_self, { NMModemBroadband *self = NM_MODEM_BROADBAND (_self); MMModemCapability modem_caps; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; modem_caps = mm_modem_get_current_capabilities (self->priv->modem_iface); /* PPP settings common to 3GPP and 3GPP2 */ s_ppp = nm_connection_get_setting_ppp (connection); if (!s_ppp) { - s_ppp = (NMSettingPPP *) nm_setting_ppp_new (); + s_ppp = (NMSettingPpp *) nm_setting_ppp_new (); g_object_set (G_OBJECT (s_ppp), NM_SETTING_PPP_LCP_ECHO_FAILURE, 5, NM_SETTING_PPP_LCP_ECHO_INTERVAL, 30, diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 653cad3575..29584b0662 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -52,11 +52,11 @@ typedef struct { guint watch_id; gboolean info_only; -} NMDHCPClientPrivate; +} NMDhcpClientPrivate; -#define NM_DHCP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_CLIENT, NMDHCPClientPrivate)) +#define NM_DHCP_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_CLIENT, NMDhcpClientPrivate)) -G_DEFINE_TYPE_EXTENDED (NMDHCPClient, nm_dhcp_client, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, {}) +G_DEFINE_TYPE_EXTENDED (NMDhcpClient, nm_dhcp_client, G_TYPE_OBJECT, G_TYPE_FLAG_ABSTRACT, {}) enum { SIGNAL_STATE_CHANGED, @@ -80,7 +80,7 @@ enum { /********************************************/ pid_t -nm_dhcp_client_get_pid (NMDHCPClient *self) +nm_dhcp_client_get_pid (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), -1); @@ -88,7 +88,7 @@ nm_dhcp_client_get_pid (NMDHCPClient *self) } const char * -nm_dhcp_client_get_iface (NMDHCPClient *self) +nm_dhcp_client_get_iface (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); @@ -96,7 +96,7 @@ nm_dhcp_client_get_iface (NMDHCPClient *self) } int -nm_dhcp_client_get_ifindex (NMDHCPClient *self) +nm_dhcp_client_get_ifindex (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), -1); @@ -104,7 +104,7 @@ nm_dhcp_client_get_ifindex (NMDHCPClient *self) } gboolean -nm_dhcp_client_get_ipv6 (NMDHCPClient *self) +nm_dhcp_client_get_ipv6 (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); @@ -112,7 +112,7 @@ nm_dhcp_client_get_ipv6 (NMDHCPClient *self) } const char * -nm_dhcp_client_get_uuid (NMDHCPClient *self) +nm_dhcp_client_get_uuid (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); @@ -120,7 +120,7 @@ nm_dhcp_client_get_uuid (NMDHCPClient *self) } const GByteArray * -nm_dhcp_client_get_duid (NMDHCPClient *self) +nm_dhcp_client_get_duid (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); @@ -128,7 +128,7 @@ nm_dhcp_client_get_duid (NMDHCPClient *self) } const GByteArray * -nm_dhcp_client_get_hw_addr (NMDHCPClient *self) +nm_dhcp_client_get_hw_addr (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL); @@ -136,7 +136,7 @@ nm_dhcp_client_get_hw_addr (NMDHCPClient *self) } guint32 -nm_dhcp_client_get_priority (NMDHCPClient *self) +nm_dhcp_client_get_priority (NMDhcpClient *self) { g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), G_MAXUINT32); @@ -188,9 +188,9 @@ reason_to_state (const char *iface, const char *reason) /********************************************/ static void -timeout_cleanup (NMDHCPClient *self) +timeout_cleanup (NMDhcpClient *self) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); if (priv->timeout_id) { g_source_remove (priv->timeout_id); @@ -199,9 +199,9 @@ timeout_cleanup (NMDHCPClient *self) } static void -watch_cleanup (NMDHCPClient *self) +watch_cleanup (NMDhcpClient *self) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); if (priv->watch_id) { g_source_remove (priv->watch_id); @@ -220,9 +220,9 @@ nm_dhcp_client_stop_pid (pid_t pid, const char *iface) } static void -stop (NMDHCPClient *self, gboolean release, const GByteArray *duid) +stop (NMDhcpClient *self, gboolean release, const GByteArray *duid) { - NMDHCPClientPrivate *priv; + NMDhcpClientPrivate *priv; g_return_if_fail (NM_IS_DHCP_CLIENT (self)); @@ -239,12 +239,12 @@ stop (NMDHCPClient *self, gboolean release, const GByteArray *duid) } void -nm_dhcp_client_set_state (NMDHCPClient *self, +nm_dhcp_client_set_state (NMDhcpClient *self, NMDhcpState new_state, GObject *ip_config, GHashTable *options) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); if (new_state >= NM_DHCP_STATE_BOUND) timeout_cleanup (self); @@ -287,8 +287,8 @@ nm_dhcp_client_set_state (NMDHCPClient *self, static gboolean daemon_timeout (gpointer user_data) { - NMDHCPClient *self = NM_DHCP_CLIENT (user_data); - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClient *self = NM_DHCP_CLIENT (user_data); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); priv->timeout_id = 0; nm_log_warn (priv->ipv6 ? LOGD_DHCP6 : LOGD_DHCP4, @@ -302,8 +302,8 @@ daemon_timeout (gpointer user_data) static void daemon_watch_cb (GPid pid, gint status, gpointer user_data) { - NMDHCPClient *self = NM_DHCP_CLIENT (user_data); - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClient *self = NM_DHCP_CLIENT (user_data); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); NMDhcpState new_state; if (priv->ipv6) { @@ -328,9 +328,9 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data) } void -nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid) +nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); g_return_if_fail (priv->pid == -1); priv->pid = pid; @@ -345,12 +345,12 @@ nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid) } gboolean -nm_dhcp_client_start_ip4 (NMDHCPClient *self, +nm_dhcp_client_start_ip4 (NMDhcpClient *self, const char *dhcp_client_id, GByteArray *dhcp_anycast_addr, const char *hostname) { - NMDHCPClientPrivate *priv; + NMDhcpClientPrivate *priv; g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); @@ -452,7 +452,7 @@ generate_duid_from_machine_id (void) } static GByteArray * -get_duid (NMDHCPClient *self) +get_duid (NMDhcpClient *self) { static GByteArray *duid = NULL; GByteArray *copy = NULL; @@ -478,13 +478,13 @@ get_duid (NMDHCPClient *self) } gboolean -nm_dhcp_client_start_ip6 (NMDHCPClient *self, +nm_dhcp_client_start_ip6 (NMDhcpClient *self, GByteArray *dhcp_anycast_addr, const char *hostname, gboolean info_only, NMSettingIP6ConfigPrivacy privacy) { - NMDHCPClientPrivate *priv; + NMDhcpClientPrivate *priv; char *str; g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), FALSE); @@ -557,9 +557,9 @@ nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name) } void -nm_dhcp_client_stop (NMDHCPClient *self, gboolean release) +nm_dhcp_client_stop (NMDhcpClient *self, gboolean release) { - NMDHCPClientPrivate *priv; + NMDhcpClientPrivate *priv; pid_t old_pid = 0; g_return_if_fail (NM_IS_DHCP_CLIENT (self)); @@ -658,11 +658,11 @@ copy_option (const char * key, } void -nm_dhcp_client_new_options (NMDHCPClient *self, +nm_dhcp_client_new_options (NMDhcpClient *self, GHashTable *options, const char *reason) { - NMDHCPClientPrivate *priv; + NMDhcpClientPrivate *priv; guint32 old_state; guint32 new_state; GHashTable *str_options = NULL; @@ -708,7 +708,7 @@ nm_dhcp_client_new_options (NMDHCPClient *self, /********************************************/ static void -nm_dhcp_client_init (NMDHCPClient *self) +nm_dhcp_client_init (NMDhcpClient *self) { NM_DHCP_CLIENT_GET_PRIVATE (self)->pid = -1; } @@ -717,7 +717,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object); switch (prop_id) { case PROP_IFACE: @@ -751,7 +751,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (object); switch (prop_id) { case PROP_IFACE: @@ -791,8 +791,8 @@ set_property (GObject *object, guint prop_id, static void dispose (GObject *object) { - NMDHCPClient *self = NM_DHCP_CLIENT (object); - NMDHCPClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); + NMDhcpClient *self = NM_DHCP_CLIENT (object); + NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self); /* Stopping the client is left up to the controlling device * explicitly since we may want to quit NetworkManager but not terminate @@ -818,11 +818,11 @@ dispose (GObject *object) } static void -nm_dhcp_client_class_init (NMDHCPClientClass *client_class) +nm_dhcp_client_class_init (NMDhcpClientClass *client_class) { GObjectClass *object_class = G_OBJECT_CLASS (client_class); - g_type_class_add_private (client_class, sizeof (NMDHCPClientPrivate)); + g_type_class_add_private (client_class, sizeof (NMDhcpClientPrivate)); /* virtual methods */ object_class->dispose = dispose; @@ -885,7 +885,7 @@ nm_dhcp_client_class_init (NMDHCPClientClass *client_class) g_signal_new (NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED, G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (NMDHCPClientClass, state_changed), + G_STRUCT_OFFSET (NMDhcpClientClass, state_changed), NULL, NULL, NULL, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_OBJECT, G_TYPE_HASH_TABLE); } diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index d01d938a2d..a36ba67b69 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -28,11 +28,11 @@ #include <nm-ip6-config.h> #define NM_TYPE_DHCP_CLIENT (nm_dhcp_client_get_type ()) -#define NM_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClient)) -#define NM_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass)) +#define NM_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient)) +#define NM_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass)) #define NM_IS_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_CLIENT)) #define NM_IS_DHCP_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_CLIENT)) -#define NM_DHCP_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDHCPClientClass)) +#define NM_DHCP_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass)) #define NM_DHCP_CLIENT_INTERFACE "iface" #define NM_DHCP_CLIENT_IFINDEX "ifindex" @@ -56,79 +56,79 @@ typedef enum { typedef struct { GObject parent; -} NMDHCPClient; +} NMDhcpClient; typedef struct { GObjectClass parent; /* Methods */ - gboolean (*ip4_start) (NMDHCPClient *self, + gboolean (*ip4_start) (NMDhcpClient *self, const char *dhcp_client_id, GByteArray *anycast_addr, const char *hostname); - gboolean (*ip6_start) (NMDHCPClient *self, + gboolean (*ip6_start) (NMDhcpClient *self, GByteArray *anycast_addr, const char *hostname, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const GByteArray *duid); - void (*stop) (NMDHCPClient *self, + void (*stop) (NMDhcpClient *self, gboolean release, const GByteArray *duid); /** * get_duid: - * @self: the #NMDHCPClient + * @self: the #NMDhcpClient * * Attempts to find an existing DHCPv6 DUID for this client in the DHCP * client's persistent configuration. Returned DUID should be the binary * representation of the DUID. If no DUID is found, %NULL should be * returned. */ - GByteArray * (*get_duid) (NMDHCPClient *self); + GByteArray * (*get_duid) (NMDhcpClient *self); /* Signals */ - void (*state_changed) (NMDHCPClient *self, + void (*state_changed) (NMDhcpClient *self, NMDhcpState state, GObject *ip_config, GHashTable *options); -} NMDHCPClientClass; +} NMDhcpClientClass; GType nm_dhcp_client_get_type (void); -pid_t nm_dhcp_client_get_pid (NMDHCPClient *self); +pid_t nm_dhcp_client_get_pid (NMDhcpClient *self); -const char *nm_dhcp_client_get_iface (NMDHCPClient *self); +const char *nm_dhcp_client_get_iface (NMDhcpClient *self); -int nm_dhcp_client_get_ifindex (NMDHCPClient *self); +int nm_dhcp_client_get_ifindex (NMDhcpClient *self); -gboolean nm_dhcp_client_get_ipv6 (NMDHCPClient *self); +gboolean nm_dhcp_client_get_ipv6 (NMDhcpClient *self); -const char *nm_dhcp_client_get_uuid (NMDHCPClient *self); +const char *nm_dhcp_client_get_uuid (NMDhcpClient *self); -const GByteArray *nm_dhcp_client_get_duid (NMDHCPClient *self); +const GByteArray *nm_dhcp_client_get_duid (NMDhcpClient *self); -const GByteArray *nm_dhcp_client_get_hw_addr (NMDHCPClient *self); +const GByteArray *nm_dhcp_client_get_hw_addr (NMDhcpClient *self); -guint32 nm_dhcp_client_get_priority (NMDHCPClient *self); +guint32 nm_dhcp_client_get_priority (NMDhcpClient *self); -gboolean nm_dhcp_client_start_ip4 (NMDHCPClient *self, +gboolean nm_dhcp_client_start_ip4 (NMDhcpClient *self, const char *dhcp_client_id, GByteArray *dhcp_anycast_addr, const char *hostname); -gboolean nm_dhcp_client_start_ip6 (NMDHCPClient *self, +gboolean nm_dhcp_client_start_ip6 (NMDhcpClient *self, GByteArray *dhcp_anycast_addr, const char *hostname, gboolean info_only, NMSettingIP6ConfigPrivacy privacy); -void nm_dhcp_client_stop (NMDHCPClient *self, gboolean release); +void nm_dhcp_client_stop (NMDhcpClient *self, gboolean release); -void nm_dhcp_client_new_options (NMDHCPClient *self, +void nm_dhcp_client_new_options (NMDhcpClient *self, GHashTable *options, const char *reason); @@ -137,9 +137,9 @@ void nm_dhcp_client_stop_existing (const char *pid_file, const char *binary_name void nm_dhcp_client_stop_pid (pid_t pid, const char *iface); -void nm_dhcp_client_watch_child (NMDHCPClient *self, pid_t pid); +void nm_dhcp_client_watch_child (NMDhcpClient *self, pid_t pid); -void nm_dhcp_client_set_state (NMDHCPClient *self, +void nm_dhcp_client_set_state (NMDhcpClient *self, NMDhcpState new_state, GObject *ip_config, /* NMIP4Config or NMIP6Config */ GHashTable *options); /* str:str hash */ diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 2f1e11deba..41f597f668 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -43,9 +43,9 @@ #include "nm-dhcp-manager.h" #include "nm-posix-signals.h" -G_DEFINE_TYPE (NMDHCPDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT) +G_DEFINE_TYPE (NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT) -#define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientPrivate)) +#define NM_DHCP_DHCLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientPrivate)) typedef struct { const char *path; @@ -53,7 +53,7 @@ typedef struct { const char *def_leasefile; char *lease_file; char *pid_file; -} NMDHCPDhclientPrivate; +} NMDhcpDhclientPrivate; const char * nm_dhcp_dhclient_get_path (const char *try_first) @@ -325,12 +325,12 @@ dhclient_child_setup (gpointer user_data G_GNUC_UNUSED) } static gboolean -dhclient_start (NMDHCPClient *client, +dhclient_start (NMDhcpClient *client, const char *mode_opt, const GByteArray *duid, gboolean release) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); GPtrArray *argv = NULL; pid_t pid; GError *error = NULL; @@ -475,12 +475,12 @@ dhclient_start (NMDHCPClient *client, } static gboolean -ip4_start (NMDHCPClient *client, +ip4_start (NMDhcpClient *client, const char *dhcp_client_id, GByteArray *dhcp_anycast_addr, const char *hostname) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); const char *iface, *uuid; iface = nm_dhcp_client_get_iface (client); @@ -496,14 +496,14 @@ ip4_start (NMDHCPClient *client, } static gboolean -ip6_start (NMDHCPClient *client, +ip6_start (NMDhcpClient *client, GByteArray *dhcp_anycast_addr, const char *hostname, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const GByteArray *duid) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); const char *iface, *uuid; iface = nm_dhcp_client_get_iface (client); @@ -519,9 +519,9 @@ ip6_start (NMDHCPClient *client, } static void -stop (NMDHCPClient *client, gboolean release, const GByteArray *duid) +stop (NMDhcpClient *client, gboolean release, const GByteArray *duid) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); /* Chain up to parent */ NM_DHCP_CLIENT_CLASS (nm_dhcp_dhclient_parent_class)->stop (client, release, duid); @@ -548,9 +548,9 @@ stop (NMDHCPClient *client, gboolean release, const GByteArray *duid) } static GByteArray * -get_duid (NMDHCPClient *client) +get_duid (NMDhcpClient *client) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (client); GByteArray *duid = NULL; char *leasefile; GError *error = NULL; @@ -599,9 +599,9 @@ static const char *def_leasefiles[] = { }; static void -nm_dhcp_dhclient_init (NMDHCPDhclient *self) +nm_dhcp_dhclient_init (NMDhcpDhclient *self) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (self); const char **iter = &def_leasefiles[0]; priv->path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH); @@ -622,7 +622,7 @@ nm_dhcp_dhclient_init (NMDHCPDhclient *self) static void dispose (GObject *object) { - NMDHCPDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (object); + NMDhcpDhclientPrivate *priv = NM_DHCP_DHCLIENT_GET_PRIVATE (object); g_free (priv->pid_file); g_free (priv->conf_file); @@ -632,12 +632,12 @@ dispose (GObject *object) } static void -nm_dhcp_dhclient_class_init (NMDHCPDhclientClass *dhclient_class) +nm_dhcp_dhclient_class_init (NMDhcpDhclientClass *dhclient_class) { - NMDHCPClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhclient_class); + NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhclient_class); GObjectClass *object_class = G_OBJECT_CLASS (dhclient_class); - g_type_class_add_private (dhclient_class, sizeof (NMDHCPDhclientPrivate)); + g_type_class_add_private (dhclient_class, sizeof (NMDhcpDhclientPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h index 20219a63e1..592109c660 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.h +++ b/src/dhcp-manager/nm-dhcp-dhclient.h @@ -25,19 +25,19 @@ #include "nm-dhcp-client.h" #define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type ()) -#define NM_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclient)) -#define NM_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass)) +#define NM_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclient)) +#define NM_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass)) #define NM_IS_DHCP_DHCLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCLIENT)) #define NM_IS_DHCP_DHCLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCLIENT)) -#define NM_DHCP_DHCLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCLIENT, NMDHCPDhclientClass)) +#define NM_DHCP_DHCLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCLIENT, NMDhcpDhclientClass)) typedef struct { - NMDHCPClient parent; -} NMDHCPDhclient; + NMDhcpClient parent; +} NMDhcpDhclient; typedef struct { - NMDHCPClientClass parent; -} NMDHCPDhclientClass; + NMDhcpClientClass parent; +} NMDhcpDhclientClass; GType nm_dhcp_dhclient_get_type (void); diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 26d85d56c0..fa2bcaff16 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -39,14 +39,14 @@ #include "nm-logging.h" #include "nm-posix-signals.h" -G_DEFINE_TYPE (NMDHCPDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT) +G_DEFINE_TYPE (NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT) -#define NM_DHCP_DHCPCD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdPrivate)) +#define NM_DHCP_DHCPCD_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdPrivate)) typedef struct { const char *path; char *pid_file; -} NMDHCPDhcpcdPrivate; +} NMDhcpDhcpcdPrivate; const char * nm_dhcp_dhcpcd_get_path (const char *try_first) @@ -87,12 +87,12 @@ dhcpcd_child_setup (gpointer user_data G_GNUC_UNUSED) } static gboolean -ip4_start (NMDHCPClient *client, +ip4_start (NMDhcpClient *client, const char *dhcp_client_id, GByteArray *dhcp_anycast_addr, const char *hostname) { - NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); GPtrArray *argv = NULL; pid_t pid = -1; GError *error = NULL; @@ -171,7 +171,7 @@ ip4_start (NMDHCPClient *client, } static gboolean -ip6_start (NMDHCPClient *client, +ip6_start (NMDhcpClient *client, GByteArray *dhcp_anycast_addr, const char *hostname, gboolean info_only, @@ -183,9 +183,9 @@ ip6_start (NMDHCPClient *client, } static void -stop (NMDHCPClient *client, gboolean release, const GByteArray *duid) +stop (NMDhcpClient *client, gboolean release, const GByteArray *duid) { - NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (client); /* Chain up to parent */ NM_DHCP_CLIENT_CLASS (nm_dhcp_dhcpcd_parent_class)->stop (client, release, duid); @@ -201,9 +201,9 @@ stop (NMDHCPClient *client, gboolean release, const GByteArray *duid) /***************************************************/ static void -nm_dhcp_dhcpcd_init (NMDHCPDhcpcd *self) +nm_dhcp_dhcpcd_init (NMDhcpDhcpcd *self) { - NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (self); priv->path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH); } @@ -211,7 +211,7 @@ nm_dhcp_dhcpcd_init (NMDHCPDhcpcd *self) static void dispose (GObject *object) { - NMDHCPDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (object); + NMDhcpDhcpcdPrivate *priv = NM_DHCP_DHCPCD_GET_PRIVATE (object); g_free (priv->pid_file); @@ -219,12 +219,12 @@ dispose (GObject *object) } static void -nm_dhcp_dhcpcd_class_init (NMDHCPDhcpcdClass *dhcpcd_class) +nm_dhcp_dhcpcd_class_init (NMDhcpDhcpcdClass *dhcpcd_class) { - NMDHCPClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhcpcd_class); + NMDhcpClientClass *client_class = NM_DHCP_CLIENT_CLASS (dhcpcd_class); GObjectClass *object_class = G_OBJECT_CLASS (dhcpcd_class); - g_type_class_add_private (dhcpcd_class, sizeof (NMDHCPDhcpcdPrivate)); + g_type_class_add_private (dhcpcd_class, sizeof (NMDhcpDhcpcdPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h index fb6b0628f4..51380eb662 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.h +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h @@ -25,19 +25,19 @@ #include "nm-dhcp-client.h" #define NM_TYPE_DHCP_DHCPCD (nm_dhcp_dhcpcd_get_type ()) -#define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcd)) -#define NM_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass)) +#define NM_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcd)) +#define NM_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass)) #define NM_IS_DHCP_DHCPCD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_DHCPCD)) #define NM_IS_DHCP_DHCPCD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_DHCPCD)) -#define NM_DHCP_DHCPCD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCPCD, NMDHCPDhcpcdClass)) +#define NM_DHCP_DHCPCD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_DHCPCD, NMDhcpDhcpcdClass)) typedef struct { - NMDHCPClient parent; -} NMDHCPDhcpcd; + NMDhcpClient parent; +} NMDhcpDhcpcd; typedef struct { - NMDHCPClientClass parent; -} NMDHCPDhcpcdClass; + NMDhcpClientClass parent; +} NMDhcpDhcpcdClass; GType nm_dhcp_dhcpcd_get_type (void); diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index c4de434976..332be3b012 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -79,12 +79,12 @@ typedef struct { GHashTable * clients; DBusGProxy * proxy; char * default_hostname; -} NMDHCPManagerPrivate; +} NMDhcpManagerPrivate; -#define NM_DHCP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_MANAGER, NMDHCPManagerPrivate)) +#define NM_DHCP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP_MANAGER, NMDhcpManagerPrivate)) -G_DEFINE_TYPE (NMDHCPManager, nm_dhcp_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcpManager, nm_dhcp_manager, G_TYPE_OBJECT) static char * garray_to_string (GArray *array, const char *key) @@ -119,10 +119,10 @@ garray_to_string (GArray *array, const char *key) return converted; } -static NMDHCPClient * -get_client_for_pid (NMDHCPManager *manager, GPid pid) +static NMDhcpClient * +get_client_for_pid (NMDhcpManager *manager, GPid pid) { - NMDHCPManagerPrivate *priv; + NMDhcpManagerPrivate *priv; GHashTableIter iter; gpointer value; @@ -132,7 +132,7 @@ get_client_for_pid (NMDHCPManager *manager, GPid pid) g_hash_table_iter_init (&iter, priv->clients); while (g_hash_table_iter_next (&iter, NULL, &value)) { - NMDHCPClient *candidate = NM_DHCP_CLIENT (value); + NMDhcpClient *candidate = NM_DHCP_CLIENT (value); if (nm_dhcp_client_get_pid (candidate) == pid) return candidate; @@ -141,10 +141,10 @@ get_client_for_pid (NMDHCPManager *manager, GPid pid) return NULL; } -static NMDHCPClient * -get_client_for_ifindex (NMDHCPManager *manager, int ifindex, gboolean ip6) +static NMDhcpClient * +get_client_for_ifindex (NMDhcpManager *manager, int ifindex, gboolean ip6) { - NMDHCPManagerPrivate *priv; + NMDhcpManagerPrivate *priv; GHashTableIter iter; gpointer value; @@ -155,7 +155,7 @@ get_client_for_ifindex (NMDHCPManager *manager, int ifindex, gboolean ip6) g_hash_table_iter_init (&iter, priv->clients); while (g_hash_table_iter_next (&iter, NULL, &value)) { - NMDHCPClient *candidate = NM_DHCP_CLIENT (value); + NMDhcpClient *candidate = NM_DHCP_CLIENT (value); if ( nm_dhcp_client_get_ifindex (candidate) == ifindex && nm_dhcp_client_get_ipv6 (candidate) == ip6) @@ -189,8 +189,8 @@ nm_dhcp_manager_handle_event (DBusGProxy *proxy, GHashTable *options, gpointer user_data) { - NMDHCPManager *manager = NM_DHCP_MANAGER (user_data); - NMDHCPClient *client; + NMDhcpManager *manager = NM_DHCP_MANAGER (user_data); + NMDhcpClient *client; char *iface = NULL; char *pid_str = NULL; char *reason = NULL; @@ -244,9 +244,9 @@ out: static void new_connection_cb (NMDBusManager *mgr, DBusGConnection *connection, - NMDHCPManager *self) + NMDhcpManager *self) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); DBusGProxy *proxy; /* Create a new proxy for the client */ @@ -266,9 +266,9 @@ new_connection_cb (NMDBusManager *mgr, static void dis_connection_cb (NMDBusManager *mgr, DBusGConnection *connection, - NMDHCPManager *self) + NMDhcpManager *self) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); DBusGProxy *proxy; proxy = g_hash_table_lookup (priv->proxies, connection); @@ -337,14 +337,14 @@ get_client_type (const char *client, GError **error) return G_TYPE_INVALID; } -static void client_state_changed (NMDHCPClient *client, +static void client_state_changed (NMDhcpClient *client, NMDhcpState state, GObject *ip_config, GHashTable *options, - NMDHCPManager *self); + NMDhcpManager *self); static void -remove_client (NMDHCPManager *self, NMDHCPClient *client) +remove_client (NMDhcpManager *self, NMDhcpClient *client) { g_signal_handlers_disconnect_by_func (client, client_state_changed, self); @@ -357,18 +357,18 @@ remove_client (NMDHCPManager *self, NMDHCPClient *client) } static void -client_state_changed (NMDHCPClient *client, +client_state_changed (NMDhcpClient *client, NMDhcpState state, GObject *ip_config, GHashTable *options, - NMDHCPManager *self) + NMDhcpManager *self) { if (state >= NM_DHCP_STATE_TIMEOUT) remove_client (self, client); } -static NMDHCPClient * -client_start (NMDHCPManager *self, +static NMDhcpClient * +client_start (NMDhcpManager *self, const char *iface, int ifindex, const GByteArray *hwaddr, @@ -382,8 +382,8 @@ client_start (NMDHCPManager *self, gboolean info_only, NMSettingIP6ConfigPrivacy privacy) { - NMDHCPManagerPrivate *priv; - NMDHCPClient *client; + NMDhcpManagerPrivate *priv; + NMDhcpClient *client; gboolean success = FALSE; g_return_val_if_fail (self, NULL); @@ -432,17 +432,17 @@ client_start (NMDHCPManager *self, } static const char * -get_send_hostname (NMDHCPManager *self, const char *setting_hostname) +get_send_hostname (NMDhcpManager *self, const char *setting_hostname) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); /* Always prefer the explicit dhcp-send-hostname if given */ return setting_hostname ? setting_hostname : priv->default_hostname; } -/* Caller owns a reference to the NMDHCPClient on return */ -NMDHCPClient * -nm_dhcp_manager_start_ip4 (NMDHCPManager *self, +/* Caller owns a reference to the NMDhcpClient on return */ +NMDhcpClient * +nm_dhcp_manager_start_ip4 (NMDhcpManager *self, const char *iface, int ifindex, const GByteArray *hwaddr, @@ -465,9 +465,9 @@ nm_dhcp_manager_start_ip4 (NMDHCPManager *self, FALSE, 0); } -/* Caller owns a reference to the NMDHCPClient on return */ -NMDHCPClient * -nm_dhcp_manager_start_ip6 (NMDHCPManager *self, +/* Caller owns a reference to the NMDhcpClient on return */ +NMDhcpClient * +nm_dhcp_manager_start_ip6 (NMDhcpManager *self, const char *iface, int ifindex, const GByteArray *hwaddr, @@ -491,9 +491,9 @@ nm_dhcp_manager_start_ip6 (NMDHCPManager *self, } void -nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager, const char *hostname) +nm_dhcp_manager_set_default_hostname (NMDhcpManager *manager, const char *hostname) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (manager); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (manager); g_clear_pointer (&priv->default_hostname, g_free); @@ -505,12 +505,12 @@ nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager, const char *hostna } GSList * -nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self, +nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, const char *iface, const char *uuid, gboolean ipv6) { - NMDHCPManagerPrivate *priv; + NMDhcpManagerPrivate *priv; g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); g_return_val_if_fail (iface != NULL, NULL); @@ -525,10 +525,10 @@ nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self, /***************************************************/ -NMDHCPManager * +NMDhcpManager * nm_dhcp_manager_get (void) { - static NMDHCPManager *singleton = NULL; + static NMDhcpManager *singleton = NULL; if (G_UNLIKELY (singleton == NULL)) singleton = g_object_new (NM_TYPE_DHCP_MANAGER, NULL); @@ -537,9 +537,9 @@ nm_dhcp_manager_get (void) } static void -nm_dhcp_manager_init (NMDHCPManager *self) +nm_dhcp_manager_init (NMDhcpManager *self) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (self); const char *client; GError *error = NULL; #if !HAVE_DBUS_GLIB_100 @@ -597,7 +597,7 @@ nm_dhcp_manager_init (NMDHCPManager *self) static void dispose (GObject *object) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object); GList *values, *iter; if (priv->clients) { @@ -630,7 +630,7 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMDHCPManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object); + NMDhcpManagerPrivate *priv = NM_DHCP_MANAGER_GET_PRIVATE (object); g_free (priv->default_hostname); @@ -641,11 +641,11 @@ finalize (GObject *object) } static void -nm_dhcp_manager_class_init (NMDHCPManagerClass *manager_class) +nm_dhcp_manager_class_init (NMDhcpManagerClass *manager_class) { GObjectClass *object_class = G_OBJECT_CLASS (manager_class); - g_type_class_add_private (manager_class, sizeof (NMDHCPManagerPrivate)); + g_type_class_add_private (manager_class, sizeof (NMDhcpManagerPrivate)); /* virtual methods */ object_class->finalize = finalize; diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index de162abab3..9c197b5432 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -32,7 +32,7 @@ typedef enum { NM_DHCP_MANAGER_ERROR_BAD_CLIENT = 0, /*< nick=BadClient >*/ NM_DHCP_MANAGER_ERROR_INTERNAL = 1, /*< nick=InternalError >*/ -} NMDHCPManagerError; +} NMDhcpManagerError; #define NM_DHCP_MANAGER_ERROR (nm_dhcp_manager_error_quark ()) @@ -40,28 +40,28 @@ GQuark nm_dhcp_manager_error_quark (void); #define NM_TYPE_DHCP_MANAGER (nm_dhcp_manager_get_type ()) -#define NM_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManager)) -#define NM_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) +#define NM_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManager)) +#define NM_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_MANAGER, NMDhcpManagerClass)) #define NM_IS_DHCP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP_MANAGER)) #define NM_IS_DHCP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP_MANAGER)) -#define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDHCPManagerClass)) +#define NM_DHCP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP_MANAGER, NMDhcpManagerClass)) typedef struct { GObject parent; -} NMDHCPManager; +} NMDhcpManager; typedef struct { GObjectClass parent; -} NMDHCPManagerClass; +} NMDhcpManagerClass; GType nm_dhcp_manager_get_type (void); -NMDHCPManager *nm_dhcp_manager_get (void); +NMDhcpManager *nm_dhcp_manager_get (void); -void nm_dhcp_manager_set_default_hostname (NMDHCPManager *manager, +void nm_dhcp_manager_set_default_hostname (NMDhcpManager *manager, const char *hostname); -NMDHCPClient * nm_dhcp_manager_start_ip4 (NMDHCPManager *manager, +NMDhcpClient * nm_dhcp_manager_start_ip4 (NMDhcpManager *manager, const char *iface, int ifindex, const GByteArray *hwaddr, @@ -73,7 +73,7 @@ NMDHCPClient * nm_dhcp_manager_start_ip4 (NMDHCPManager *manager, guint32 timeout, GByteArray *dhcp_anycast_addr); -NMDHCPClient * nm_dhcp_manager_start_ip6 (NMDHCPManager *manager, +NMDhcpClient * nm_dhcp_manager_start_ip6 (NMDhcpManager *manager, const char *iface, int ifindex, const GByteArray *hwaddr, @@ -85,7 +85,7 @@ NMDHCPClient * nm_dhcp_manager_start_ip6 (NMDHCPManager *manager, gboolean info_only, NMSettingIP6ConfigPrivacy privacy); -GSList * nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self, +GSList * nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self, const char *iface, const char *uuid, gboolean ipv6); diff --git a/src/main.c b/src/main.c index 6886586940..f883689568 100644 --- a/src/main.c +++ b/src/main.c @@ -344,11 +344,11 @@ main (int argc, char *argv[]) gboolean success, show_version = FALSE; int i; NMManager *manager = NULL; - gs_unref_object NMVPNManager *vpn_manager = NULL; + gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMDnsManager *dns_mgr = NULL; gs_unref_object NMDBusManager *dbus_mgr = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; - gs_unref_object NMDHCPManager *dhcp_mgr = NULL; + gs_unref_object NMDhcpManager *dhcp_mgr = NULL; gs_unref_object NMFirewallManager *fw_mgr = NULL; gs_unref_object NMSettings *settings = NULL; gs_unref_object NMConfig *config = NULL; diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c index f73baffa4a..361ad5bc09 100644 --- a/src/nm-dhcp4-config.c +++ b/src/nm-dhcp4-config.c @@ -29,14 +29,14 @@ #include "nm-utils.h" -G_DEFINE_TYPE (NMDHCP4Config, nm_dhcp4_config, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp4Config, nm_dhcp4_config, G_TYPE_OBJECT) -#define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigPrivate)) +#define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigPrivate)) typedef struct { char *dbus_path; GHashTable *options; -} NMDHCP4ConfigPrivate; +} NMDhcp4ConfigPrivate; enum { @@ -47,14 +47,14 @@ enum { }; -NMDHCP4Config * +NMDhcp4Config * nm_dhcp4_config_new (void) { return NM_DHCP4_CONFIG (g_object_new (NM_TYPE_DHCP4_CONFIG, NULL)); } void -nm_dhcp4_config_add_option (NMDHCP4Config *self, +nm_dhcp4_config_add_option (NMDhcp4Config *self, const char *key, const char *option) { @@ -72,7 +72,7 @@ nm_dhcp4_config_add_option (NMDHCP4Config *self, } void -nm_dhcp4_config_reset (NMDHCP4Config *self) +nm_dhcp4_config_reset (NMDhcp4Config *self) { g_return_if_fail (NM_IS_DHCP4_CONFIG (self)); @@ -81,7 +81,7 @@ nm_dhcp4_config_reset (NMDHCP4Config *self) } const char * -nm_dhcp4_config_get_option (NMDHCP4Config *self, const char *key) +nm_dhcp4_config_get_option (NMDhcp4Config *self, const char *key) { GValue *value; @@ -94,7 +94,7 @@ nm_dhcp4_config_get_option (NMDHCP4Config *self, const char *key) /* Caller owns the list, but not the values in the list */ GSList * -nm_dhcp4_config_list_options (NMDHCP4Config *self) +nm_dhcp4_config_list_options (NMDhcp4Config *self) { GHashTableIter iter; const char *option = NULL; @@ -110,7 +110,7 @@ nm_dhcp4_config_list_options (NMDHCP4Config *self) } const char * -nm_dhcp4_config_get_dbus_path (NMDHCP4Config *self) +nm_dhcp4_config_get_dbus_path (NMDhcp4Config *self) { g_return_val_if_fail (NM_IS_DHCP4_CONFIG (self), NULL); @@ -127,9 +127,9 @@ nm_gvalue_destroy (gpointer data) } static void -nm_dhcp4_config_init (NMDHCP4Config *self) +nm_dhcp4_config_init (NMDhcp4Config *self) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (self); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (self); static guint32 counter = 0; priv->dbus_path = g_strdup_printf (NM_DBUS_PATH "/DHCP4Config/%d", counter++); @@ -141,7 +141,7 @@ nm_dhcp4_config_init (NMDHCP4Config *self) static void finalize (GObject *object) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); g_free (priv->dbus_path); g_hash_table_destroy (priv->options); @@ -153,7 +153,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDHCP4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); + NMDhcp4ConfigPrivate *priv = NM_DHCP4_CONFIG_GET_PRIVATE (object); switch (prop_id) { case PROP_OPTIONS: @@ -166,11 +166,11 @@ get_property (GObject *object, guint prop_id, } static void -nm_dhcp4_config_class_init (NMDHCP4ConfigClass *config_class) +nm_dhcp4_config_class_init (NMDhcp4ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMDHCP4ConfigPrivate)); + g_type_class_add_private (config_class, sizeof (NMDhcp4ConfigPrivate)); /* virtual methods */ object_class->get_property = get_property; diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h index e893f892b7..bdaa7edcfa 100644 --- a/src/nm-dhcp4-config.h +++ b/src/nm-dhcp4-config.h @@ -27,37 +27,37 @@ #include "nm-types.h" #define NM_TYPE_DHCP4_CONFIG (nm_dhcp4_config_get_type ()) -#define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4Config)) -#define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) +#define NM_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP4_CONFIG, NMDhcp4Config)) +#define NM_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigClass)) #define NM_IS_DHCP4_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP4_CONFIG)) #define NM_IS_DHCP4_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP4_CONFIG)) -#define NM_DHCP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDHCP4ConfigClass)) +#define NM_DHCP4_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigClass)) -struct _NMDHCP4Config { +struct _NMDhcp4Config { GObject parent; }; typedef struct { GObjectClass parent; -} NMDHCP4ConfigClass; +} NMDhcp4ConfigClass; #define NM_DHCP4_CONFIG_OPTIONS "options" GType nm_dhcp4_config_get_type (void); -NMDHCP4Config *nm_dhcp4_config_new (void); +NMDhcp4Config *nm_dhcp4_config_new (void); -const char *nm_dhcp4_config_get_dbus_path (NMDHCP4Config *config); +const char *nm_dhcp4_config_get_dbus_path (NMDhcp4Config *config); -void nm_dhcp4_config_add_option (NMDHCP4Config *config, +void nm_dhcp4_config_add_option (NMDhcp4Config *config, const char *key, const char *option); -void nm_dhcp4_config_reset (NMDHCP4Config *config); +void nm_dhcp4_config_reset (NMDhcp4Config *config); -const char *nm_dhcp4_config_get_option (NMDHCP4Config *config, const char *option); +const char *nm_dhcp4_config_get_option (NMDhcp4Config *config, const char *option); -GSList *nm_dhcp4_config_list_options (NMDHCP4Config *config); +GSList *nm_dhcp4_config_list_options (NMDhcp4Config *config); #endif /* NM_DHCP4_CONFIG_H */ diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c index 2eb4ab1930..55dac5da84 100644 --- a/src/nm-dhcp6-config.c +++ b/src/nm-dhcp6-config.c @@ -29,14 +29,14 @@ #include "nm-utils.h" -G_DEFINE_TYPE (NMDHCP6Config, nm_dhcp6_config, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, G_TYPE_OBJECT) -#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigPrivate)) +#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigPrivate)) typedef struct { char *dbus_path; GHashTable *options; -} NMDHCP6ConfigPrivate; +} NMDhcp6ConfigPrivate; enum { @@ -47,14 +47,14 @@ enum { }; -NMDHCP6Config * +NMDhcp6Config * nm_dhcp6_config_new (void) { return NM_DHCP6_CONFIG (g_object_new (NM_TYPE_DHCP6_CONFIG, NULL)); } void -nm_dhcp6_config_add_option (NMDHCP6Config *self, +nm_dhcp6_config_add_option (NMDhcp6Config *self, const char *key, const char *option) { @@ -72,7 +72,7 @@ nm_dhcp6_config_add_option (NMDHCP6Config *self, } void -nm_dhcp6_config_reset (NMDHCP6Config *self) +nm_dhcp6_config_reset (NMDhcp6Config *self) { g_return_if_fail (NM_IS_DHCP6_CONFIG (self)); @@ -81,7 +81,7 @@ nm_dhcp6_config_reset (NMDHCP6Config *self) } const char * -nm_dhcp6_config_get_option (NMDHCP6Config *self, const char *key) +nm_dhcp6_config_get_option (NMDhcp6Config *self, const char *key) { GValue *value; @@ -94,7 +94,7 @@ nm_dhcp6_config_get_option (NMDHCP6Config *self, const char *key) /* Caller owns the list, but not the values in the list */ GSList * -nm_dhcp6_config_list_options (NMDHCP6Config *self) +nm_dhcp6_config_list_options (NMDhcp6Config *self) { GHashTableIter iter; const char *option = NULL; @@ -110,7 +110,7 @@ nm_dhcp6_config_list_options (NMDHCP6Config *self) } const char * -nm_dhcp6_config_get_dbus_path (NMDHCP6Config *self) +nm_dhcp6_config_get_dbus_path (NMDhcp6Config *self) { g_return_val_if_fail (NM_IS_DHCP6_CONFIG (self), NULL); @@ -127,9 +127,9 @@ nm_gvalue_destroy (gpointer data) } static void -nm_dhcp6_config_init (NMDHCP6Config *self) +nm_dhcp6_config_init (NMDhcp6Config *self) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (self); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (self); static guint32 counter = 0; priv->dbus_path = g_strdup_printf (NM_DBUS_PATH "/DHCP6Config/%d", counter++); @@ -141,7 +141,7 @@ nm_dhcp6_config_init (NMDHCP6Config *self) static void finalize (GObject *object) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); g_free (priv->dbus_path); g_hash_table_destroy (priv->options); @@ -153,7 +153,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); switch (prop_id) { case PROP_OPTIONS: @@ -166,11 +166,11 @@ get_property (GObject *object, guint prop_id, } static void -nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) +nm_dhcp6_config_class_init (NMDhcp6ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMDHCP6ConfigPrivate)); + g_type_class_add_private (config_class, sizeof (NMDhcp6ConfigPrivate)); /* virtual methods */ object_class->get_property = get_property; diff --git a/src/nm-dhcp6-config.h b/src/nm-dhcp6-config.h index ff61b85897..e577d3d3d8 100644 --- a/src/nm-dhcp6-config.h +++ b/src/nm-dhcp6-config.h @@ -27,37 +27,37 @@ #include "nm-types.h" #define NM_TYPE_DHCP6_CONFIG (nm_dhcp6_config_get_type ()) -#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6Config)) -#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) +#define NM_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP6_CONFIG, NMDhcp6Config)) +#define NM_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigClass)) #define NM_IS_DHCP6_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DHCP6_CONFIG)) #define NM_IS_DHCP6_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DHCP6_CONFIG)) -#define NM_DHCP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigClass)) +#define NM_DHCP6_CONFIG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigClass)) -struct _NMDHCP6Config { +struct _NMDhcp6Config { GObject parent; }; typedef struct { GObjectClass parent; -} NMDHCP6ConfigClass; +} NMDhcp6ConfigClass; #define NM_DHCP6_CONFIG_OPTIONS "options" GType nm_dhcp6_config_get_type (void); -NMDHCP6Config *nm_dhcp6_config_new (void); +NMDhcp6Config *nm_dhcp6_config_new (void); -const char *nm_dhcp6_config_get_dbus_path (NMDHCP6Config *config); +const char *nm_dhcp6_config_get_dbus_path (NMDhcp6Config *config); -void nm_dhcp6_config_add_option (NMDHCP6Config *config, +void nm_dhcp6_config_add_option (NMDhcp6Config *config, const char *key, const char *option); -void nm_dhcp6_config_reset (NMDHCP6Config *config); +void nm_dhcp6_config_reset (NMDhcp6Config *config); -const char *nm_dhcp6_config_get_option (NMDHCP6Config *config, const char *option); +const char *nm_dhcp6_config_get_option (NMDhcp6Config *config, const char *option); -GSList *nm_dhcp6_config_list_options (NMDHCP6Config *self); +GSList *nm_dhcp6_config_list_options (NMDhcp6Config *self); #endif /* NM_DHCP6_CONFIG_H */ diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index 2637cc8bcb..fddd0d5a86 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -94,7 +94,7 @@ dump_object_to_props (GObject *object, GHashTable *hash) } static void -dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash) +dump_dhcp4_to_props (NMDhcp4Config *config, GHashTable *hash) { GSList *options, *iter; @@ -110,7 +110,7 @@ dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash) } static void -dump_dhcp6_to_props (NMDHCP6Config *config, GHashTable *hash) +dump_dhcp6_to_props (NMDhcp6Config *config, GHashTable *hash) { GSList *options, *iter; @@ -135,8 +135,8 @@ fill_device_props (NMDevice *device, { NMIP4Config *ip4_config; NMIP6Config *ip6_config; - NMDHCP4Config *dhcp4_config; - NMDHCP6Config *dhcp6_config; + NMDhcp4Config *dhcp4_config; + NMDhcp6Config *dhcp6_config; /* If the action is for a VPN, send the VPN's IP interface instead of the device's */ value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_IP_INTERFACE, nm_device_get_ip_iface (device)); diff --git a/src/nm-manager.c b/src/nm-manager.c index d6ef757a69..1354717a80 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -199,7 +199,7 @@ typedef struct { gboolean sleeping; gboolean net_enabled; - NMVPNManager *vpn_manager; + NMVpnManager *vpn_manager; DBusGProxy *aipd_proxy; NMSleepMonitor *sleep_monitor; @@ -3492,7 +3492,7 @@ nm_manager_deactivate_connection (NMManager *manager, } if (NM_IS_VPN_CONNECTION (active)) { - NMVPNConnectionStateReason vpn_reason = NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED; + NMVpnConnectionStateReason vpn_reason = NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED; if (reason == NM_DEVICE_STATE_REASON_CONNECTION_REMOVED) vpn_reason = NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED; diff --git a/src/nm-policy.c b/src/nm-policy.c index f31894ce2a..a0cf71e5a9 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -415,7 +415,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) } if (best4) { - NMDHCP4Config *dhcp4_config; + NMDhcp4Config *dhcp4_config; /* Grab a hostname out of the device's DHCP4 config */ dhcp4_config = nm_device_get_dhcp4_config (best4); @@ -434,7 +434,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) } } } else if (best6) { - NMDHCP6Config *dhcp6_config; + NMDhcp6Config *dhcp6_config; /* Grab a hostname out of the device's DHCP6 config */ dhcp6_config = nm_device_get_dhcp6_config (best6); @@ -523,7 +523,7 @@ get_best_ip4_config (NMPolicy *policy, int *out_ip_ifindex, NMActiveConnection **out_ac, NMDevice **out_device, - NMVPNConnection **out_vpn) + NMVpnConnection **out_vpn) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); const GSList *connections, *iter; @@ -535,11 +535,11 @@ get_best_ip4_config (NMPolicy *policy, connections = nm_manager_get_active_connections (priv->manager); for (iter = connections; iter; iter = g_slist_next (iter)) { NMActiveConnection *active = NM_ACTIVE_CONNECTION (iter->data); - NMVPNConnection *candidate; + NMVpnConnection *candidate; NMIP4Config *vpn_ip4; NMConnection *tmp; NMSettingIP4Config *s_ip4; - NMVPNConnectionState vpn_state; + NMVpnConnectionState vpn_state; if (!NM_IS_VPN_CONNECTION (active)) continue; @@ -608,7 +608,7 @@ update_ip4_dns (NMPolicy *policy, NMDnsManager *dns_mgr) { NMIP4Config *ip4_config; const char *ip_iface = NULL; - NMVPNConnection *vpn = NULL; + NMVpnConnection *vpn = NULL; NMDnsIPConfigType dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE; ip4_config = get_best_ip4_config (policy, TRUE, &ip_iface, NULL, NULL, NULL, &vpn); @@ -629,7 +629,7 @@ update_ip4_routing (NMPolicy *policy, gboolean force_update) NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMDevice *best = NULL, *default_device; NMConnection *connection = NULL; - NMVPNConnection *vpn = NULL; + NMVpnConnection *vpn = NULL; NMActiveConnection *best_ac = NULL; NMIP4Config *ip4_config = NULL; const char *ip_iface = NULL; @@ -721,7 +721,7 @@ get_best_ip6_config (NMPolicy *policy, int *out_ip_ifindex, NMActiveConnection **out_ac, NMDevice **out_device, - NMVPNConnection **out_vpn) + NMVpnConnection **out_vpn) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); const GSList *connections, *iter; @@ -733,11 +733,11 @@ get_best_ip6_config (NMPolicy *policy, connections = nm_manager_get_active_connections (priv->manager); for (iter = connections; iter; iter = g_slist_next (iter)) { NMActiveConnection *active = NM_ACTIVE_CONNECTION (iter->data); - NMVPNConnection *candidate; + NMVpnConnection *candidate; NMIP6Config *vpn_ip6; NMConnection *tmp; NMSettingIP6Config *s_ip6; - NMVPNConnectionState vpn_state; + NMVpnConnectionState vpn_state; if (!NM_IS_VPN_CONNECTION (active)) continue; @@ -806,7 +806,7 @@ update_ip6_dns (NMPolicy *policy, NMDnsManager *dns_mgr) { NMIP6Config *ip6_config; const char *ip_iface = NULL; - NMVPNConnection *vpn = NULL; + NMVpnConnection *vpn = NULL; NMDnsIPConfigType dns_type = NM_DNS_IP_CONFIG_TYPE_BEST_DEVICE; ip6_config = get_best_ip6_config (policy, TRUE, &ip_iface, NULL, NULL, NULL, &vpn); @@ -827,7 +827,7 @@ update_ip6_routing (NMPolicy *policy, gboolean force_update) NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMDevice *best = NULL, *default_device6; NMConnection *connection = NULL; - NMVPNConnection *vpn = NULL; + NMVpnConnection *vpn = NULL; NMActiveConnection *best_ac = NULL; NMIP6Config *ip6_config = NULL; const char *ip_iface = NULL; @@ -1726,7 +1726,7 @@ device_removed (NMManager *manager, NMDevice *device, gpointer user_data) /**************************************************************************/ static void -vpn_connection_activated (NMPolicy *policy, NMVPNConnection *vpn) +vpn_connection_activated (NMPolicy *policy, NMVpnConnection *vpn) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMIP4Config *ip4_config; @@ -1753,7 +1753,7 @@ vpn_connection_activated (NMPolicy *policy, NMVPNConnection *vpn) } static void -vpn_connection_deactivated (NMPolicy *policy, NMVPNConnection *vpn) +vpn_connection_deactivated (NMPolicy *policy, NMVpnConnection *vpn) { NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (policy); NMIP4Config *ip4_config; @@ -1779,10 +1779,10 @@ vpn_connection_deactivated (NMPolicy *policy, NMVPNConnection *vpn) } static void -vpn_connection_state_changed (NMVPNConnection *vpn, - NMVPNConnectionState new_state, - NMVPNConnectionState old_state, - NMVPNConnectionStateReason reason, +vpn_connection_state_changed (NMVpnConnection *vpn, + NMVpnConnectionState new_state, + NMVpnConnectionState old_state, + NMVpnConnectionStateReason reason, NMPolicy *policy) { if (new_state == NM_VPN_CONNECTION_STATE_ACTIVATED) diff --git a/src/nm-types.h b/src/nm-types.h index a08d0f0db1..e902e30175 100644 --- a/src/nm-types.h +++ b/src/nm-types.h @@ -29,8 +29,8 @@ typedef struct _NMConnectionProvider NMConnectionProvider; typedef struct _NMConnectivity NMConnectivity; typedef struct _NMDBusManager NMDBusManager; typedef struct _NMDevice NMDevice; -typedef struct _NMDHCP4Config NMDHCP4Config; -typedef struct _NMDHCP6Config NMDHCP6Config; +typedef struct _NMDhcp4Config NMDhcp4Config; +typedef struct _NMDhcp6Config NMDhcp6Config; typedef struct _NMIP4Config NMIP4Config; typedef struct _NMIP6Config NMIP6Config; typedef struct _NMManager NMManager; diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 245bcf27dd..5dc735f187 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -524,7 +524,7 @@ set_ip_config_common (NMPPPManager *self, { NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (self); NMConnection *connection; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; GValue *val; val = g_hash_table_lookup (hash, iface_prop); @@ -894,8 +894,8 @@ pppd_timed_out (gpointer data) static NMCmdLine * create_pppd_cmd_line (NMPPPManager *self, - NMSettingPPP *setting, - NMSettingPPPOE *pppoe, + NMSettingPpp *setting, + NMSettingPppoe *pppoe, NMSettingAdsl *adsl, const char *ppp_name, GError **err) @@ -1097,7 +1097,7 @@ pppd_child_setup (gpointer user_data G_GNUC_UNUSED) } static void -pppoe_fill_defaults (NMSettingPPP *setting) +pppoe_fill_defaults (NMSettingPpp *setting) { if (!nm_setting_ppp_get_mtu (setting)) g_object_set (setting, NM_SETTING_PPP_MTU, (guint32) 1492, NULL); @@ -1110,7 +1110,7 @@ pppoe_fill_defaults (NMSettingPPP *setting) NM_SETTING_PPP_NODEFLATE, TRUE, NULL); - /* FIXME: These commented settings should be set as well, update NMSettingPPP first. */ + /* FIXME: These commented settings should be set as well, update NMSettingPpp first. */ #if 0 setting->noipdefault = TRUE; setting->default_asyncmap = TRUE; @@ -1132,9 +1132,9 @@ nm_ppp_manager_start (NMPPPManager *manager, { NMPPPManagerPrivate *priv; NMConnection *connection; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; gboolean s_ppp_created = FALSE; - NMSettingPPPOE *pppoe_setting; + NMSettingPppoe *pppoe_setting; NMSettingAdsl *adsl_setting; NMCmdLine *ppp_cmd; char *cmd_str; diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 3a833db0c9..09f0909988 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -783,7 +783,7 @@ secret_agent_registered (NMAgentManager *agent_mgr, static void openconnect_migrate_hack (NMConnection *connection) { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; NMSettingSecretFlags flags = NM_SETTING_SECRET_FLAG_NOT_SAVED; /* Huge hack. There were some openconnect changes that needed to happen diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 95d2e7d30f..1cbbdbf7f3 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -12006,8 +12006,8 @@ test_write_wired_pppoe (void) NMSettingConnection *s_con; NMSettingWired *s_wired; NMSettingIP4Config *s_ip4; - NMSettingPPPOE *s_pppoe; - NMSettingPPP *s_ppp; + NMSettingPppoe *s_pppoe; + NMSettingPpp *s_ppp; char *uuid; gboolean success; GError *error = NULL; @@ -12041,7 +12041,7 @@ test_write_wired_pppoe (void) NULL); /* 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 (G_OBJECT (s_pppoe), @@ -12051,7 +12051,7 @@ test_write_wired_pppoe (void) NULL); /* PPP setting */ - s_ppp = (NMSettingPPP *) nm_setting_ppp_new (); + s_ppp = (NMSettingPpp *) nm_setting_ppp_new (); nm_connection_add_setting (connection, NM_SETTING (s_ppp)); ASSERT (nm_connection_verify (connection, &error) == TRUE, @@ -12075,7 +12075,7 @@ test_write_vpn (void) NMConnection *connection; NMSettingConnection *s_con; NMSettingIP4Config *s_ip4; - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; char *uuid; gboolean success; GError *error = NULL; @@ -12097,7 +12097,7 @@ test_write_vpn (void) g_free (uuid); /* 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, @@ -12139,7 +12139,7 @@ test_write_mobile_broadband (gboolean gsm) NMSettingIP4Config *s_ip4; NMSettingGsm *s_gsm; NMSettingCdma *s_cdma; - NMSettingPPP *s_ppp; + NMSettingPpp *s_ppp; NMSettingSerial *s_serial; char *uuid; gboolean success; @@ -12195,7 +12195,7 @@ test_write_mobile_broadband (gboolean gsm) NULL); /* PPP setting */ - s_ppp = (NMSettingPPP *) nm_setting_ppp_new (); + s_ppp = (NMSettingPpp *) nm_setting_ppp_new (); nm_connection_add_setting (connection, NM_SETTING (s_ppp)); ASSERT (nm_connection_verify (connection, &error) == TRUE, diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 32fccfc76d..382b890008 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -1575,8 +1575,8 @@ make_pppoe_connection_setting (NMConnection *connection, const char *conn_name, GError **error) { - NMSettingPPPOE *s_pppoe; - NMSettingPPP *s_ppp; + NMSettingPppoe *s_pppoe; + NMSettingPpp *s_ppp; const char *value; s_pppoe = NM_SETTING_PPPOE (nm_setting_pppoe_new ()); @@ -1600,7 +1600,7 @@ make_pppoe_connection_setting (NMConnection *connection, nm_connection_add_setting (connection, NM_SETTING (s_pppoe)); /* PPP setting */ - s_ppp = (NMSettingPPP *) nm_setting_ppp_new (); + s_ppp = (NMSettingPpp *) nm_setting_ppp_new (); nm_connection_add_setting (connection, NM_SETTING (s_ppp)); } @@ -2717,7 +2717,7 @@ write_ip6_setting (NMConnection *connection, const char *conn_name, GError **err } static gboolean -write_pppoe_setting (const char *conn_name, NMSettingPPPOE * s_pppoe) +write_pppoe_setting (const char *conn_name, NMSettingPppoe * s_pppoe) { const gchar *value; @@ -2776,7 +2776,7 @@ ifnet_update_parsers_by_connection (NMConnection *connection, if (!write_wireless_setting (connection, conn_name, &no_8021x, &new_name, error)) goto out; } else if (!strcmp (type, NM_SETTING_PPPOE_SETTING_NAME)) { - NMSettingPPPOE *s_pppoe; + NMSettingPppoe *s_pppoe; /* Writing pppoe setting */ s_pppoe = nm_connection_get_setting_pppoe (connection); diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index ff7780c845..0b0b75a532 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -1180,7 +1180,7 @@ read_setting (GKeyFile *file, const char *keyfile_path, const char *group) } static void -read_vpn_secrets (GKeyFile *file, NMSettingVPN *s_vpn) +read_vpn_secrets (GKeyFile *file, NMSettingVpn *s_vpn) { char **keys, **iter; @@ -1318,7 +1318,7 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error) /* Handle vpn secrets after the 'vpn' setting was read */ if (vpn_secrets) { - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; s_vpn = nm_connection_get_setting_vpn (connection); if (s_vpn) diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 4dc3f002e1..d38fce1b6d 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -50,7 +50,7 @@ #include "nm-vpn-connection-glue.h" -G_DEFINE_TYPE (NMVPNConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION) +G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION) typedef enum { /* Only system secrets */ @@ -65,7 +65,7 @@ typedef enum { SECRETS_REQ_LAST } SecretsReq; -/* Internal VPN states, private to NMVPNConnection */ +/* Internal VPN states, private to NMVpnConnection */ typedef enum { STATE_UNKNOWN = 0, STATE_WAITING, @@ -89,7 +89,7 @@ typedef struct { VpnState vpn_state; guint dispatcher_id; - NMVPNConnectionStateReason failure_reason; + NMVpnConnectionStateReason failure_reason; DBusGProxy *proxy; GHashTable *connect_hash; @@ -106,9 +106,9 @@ typedef struct { int ip_ifindex; char *banner; guint32 mtu; -} NMVPNConnectionPrivate; +} NMVpnConnectionPrivate; -#define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVPNConnectionPrivate)) +#define NM_VPN_CONNECTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_CONNECTION, NMVpnConnectionPrivate)) enum { VPN_STATE_CHANGED, @@ -130,7 +130,7 @@ enum { LAST_PROP }; -static void get_secrets (NMVPNConnection *self, +static void get_secrets (NMVpnConnection *self, SecretsReq secrets_idx, const char **hints); @@ -139,14 +139,14 @@ static void plugin_interactive_secrets_required (DBusGProxy *proxy, const char **secrets, gpointer user_data); -static void _set_vpn_state (NMVPNConnection *connection, +static void _set_vpn_state (NMVpnConnection *connection, VpnState vpn_state, - NMVPNConnectionStateReason reason, + NMVpnConnectionStateReason reason, gboolean quitting); /*********************************************************************/ -static NMVPNConnectionState +static NMVpnConnectionState _state_to_nm_vpn_state (VpnState state) { switch (state) { @@ -206,9 +206,9 @@ _state_to_ac_state (VpnState vpn_state) } static void -call_plugin_disconnect (NMVPNConnection *self) +call_plugin_disconnect (NMVpnConnection *self) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GError *error = NULL; if (priv->proxy) { @@ -225,9 +225,9 @@ call_plugin_disconnect (NMVPNConnection *self) } static void -vpn_cleanup (NMVPNConnection *connection, NMDevice *parent_dev) +vpn_cleanup (NMVpnConnection *connection, NMDevice *parent_dev) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); if (priv->ip_ifindex) { nm_platform_link_set_down (priv->ip_ifindex); @@ -255,8 +255,8 @@ vpn_cleanup (NMVPNConnection *connection, NMDevice *parent_dev) static void dispatcher_pre_down_done (guint call_id, gpointer user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); priv->dispatcher_id = 0; _set_vpn_state (self, STATE_DISCONNECTED, NM_VPN_CONNECTION_STATE_REASON_NONE, FALSE); @@ -265,17 +265,17 @@ dispatcher_pre_down_done (guint call_id, gpointer user_data) static void dispatcher_pre_up_done (guint call_id, gpointer user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); priv->dispatcher_id = 0; _set_vpn_state (self, STATE_ACTIVATED, NM_VPN_CONNECTION_STATE_REASON_NONE, FALSE); } static void -dispatcher_cleanup (NMVPNConnection *self) +dispatcher_cleanup (NMVpnConnection *self) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); if (priv->dispatcher_id) { nm_dispatcher_call_cancel (priv->dispatcher_id); @@ -284,14 +284,14 @@ dispatcher_cleanup (NMVPNConnection *self) } static void -_set_vpn_state (NMVPNConnection *connection, +_set_vpn_state (NMVpnConnection *connection, VpnState vpn_state, - NMVPNConnectionStateReason reason, + NMVpnConnectionStateReason reason, gboolean quitting) { - NMVPNConnectionPrivate *priv; + NMVpnConnectionPrivate *priv; VpnState old_vpn_state; - NMVPNConnectionState new_external_state, old_external_state; + NMVpnConnectionState new_external_state, old_external_state; NMDevice *parent_dev = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (connection)); g_return_if_fail (NM_IS_VPN_CONNECTION (connection)); @@ -560,7 +560,7 @@ add_ip6_vpn_gateway_route (NMIP6Config *config, nm_ip6_config_add_route (config, &route); } -NMVPNConnection * +NMVpnConnection * nm_vpn_connection_new (NMConnection *connection, NMDevice *parent_device, const char *specific_object, @@ -569,7 +569,7 @@ nm_vpn_connection_new (NMConnection *connection, g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL); - return (NMVPNConnection *) g_object_new (NM_TYPE_VPN_CONNECTION, + return (NMVpnConnection *) g_object_new (NM_TYPE_VPN_CONNECTION, NM_ACTIVE_CONNECTION_INT_CONNECTION, connection, NM_ACTIVE_CONNECTION_INT_DEVICE, parent_device, NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, specific_object, @@ -579,17 +579,17 @@ nm_vpn_connection_new (NMConnection *connection, } static const char * -nm_vpn_connection_get_service (NMVPNConnection *connection) +nm_vpn_connection_get_service (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); - NMSettingVPN *s_vpn; + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMSettingVpn *s_vpn; s_vpn = nm_connection_get_setting_vpn (priv->connection); return nm_setting_vpn_get_service_type (s_vpn); } static const char * -vpn_plugin_failure_to_string (NMVPNPluginFailure failure) +vpn_plugin_failure_to_string (NMVpnPluginFailure failure) { switch (failure) { case NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED: @@ -606,10 +606,10 @@ vpn_plugin_failure_to_string (NMVPNPluginFailure failure) static void plugin_failed (DBusGProxy *proxy, - NMVPNPluginFailure plugin_failure, + NMVpnPluginFailure plugin_failure, gpointer user_data) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (user_data); nm_log_warn (LOGD_VPN, "VPN plugin failed: %s (%d)", vpn_plugin_failure_to_string (plugin_failure), plugin_failure); @@ -627,7 +627,7 @@ plugin_failed (DBusGProxy *proxy, } static const char * -vpn_service_state_to_string (NMVPNServiceState state) +vpn_service_state_to_string (NMVpnServiceState state) { switch (state) { case NM_VPN_SERVICE_STATE_INIT: @@ -671,7 +671,7 @@ vpn_state_to_string (VpnState state) } static const char * -vpn_reason_to_string (NMVPNConnectionStateReason reason) +vpn_reason_to_string (NMVpnConnectionStateReason reason) { switch (reason) { case NM_VPN_CONNECTION_STATE_REASON_NONE: @@ -704,11 +704,11 @@ vpn_reason_to_string (NMVPNConnectionStateReason reason) static void plugin_state_changed (DBusGProxy *proxy, - NMVPNServiceState state, + NMVpnServiceState state, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); nm_log_info (LOGD_VPN, "VPN plugin state changed: %s (%d)", vpn_service_state_to_string (state), state); @@ -731,9 +731,9 @@ plugin_state_changed (DBusGProxy *proxy, } static void -print_vpn_config (NMVPNConnection *connection) +print_vpn_config (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); const NMPlatformIP4Address *address4; const NMPlatformIP6Address *address6; char *dns_domain = NULL; @@ -835,9 +835,9 @@ print_vpn_config (NMVPNConnection *connection) } static gboolean -nm_vpn_connection_apply_config (NMVPNConnection *connection) +nm_vpn_connection_apply_config (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); NMDevice *parent_dev = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (connection)); NMIP4Config *vpn4_parent_config = NULL; NMIP6Config *vpn6_parent_config = NULL; @@ -895,10 +895,10 @@ nm_vpn_connection_apply_config (NMVPNConnection *connection) } static void -nm_vpn_connection_config_maybe_complete (NMVPNConnection *connection, +nm_vpn_connection_config_maybe_complete (NMVpnConnection *connection, gboolean success) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); if (priv->connect_timeout == 0) { /* config_complete() was already called with an error; @@ -938,10 +938,10 @@ nm_vpn_connection_config_maybe_complete (NMVPNConnection *connection, nm_connection_get_id (priv->connection), property) static gboolean -process_generic_config (NMVPNConnection *connection, +process_generic_config (NMVpnConnection *connection, GHashTable *config_hash) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); GValue *val; g_clear_pointer (&priv->ip_iface, g_free); @@ -1017,8 +1017,8 @@ nm_vpn_connection_config_get (DBusGProxy *proxy, GHashTable *config_hash, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); GValue *val; nm_log_info (LOGD_VPN, "VPN connection '%s' (IP Config Get) reply received.", @@ -1053,9 +1053,9 @@ nm_vpn_connection_config_get (DBusGProxy *proxy, } static guint -vpn_routing_metric (NMVPNConnection *connection) +vpn_routing_metric (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); if (priv->ip_ifindex) return NM_PLATFORM_ROUTE_METRIC_DEFAULT; @@ -1071,8 +1071,8 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy, GHashTable *config_hash, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); NMPlatformIP4Address address; NMIP4Config *config; GValue *val; @@ -1226,8 +1226,8 @@ nm_vpn_connection_ip6_config_get (DBusGProxy *proxy, GHashTable *config_hash, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); NMPlatformIP6Address address; NMIP6Config *config; GValue *val; @@ -1370,8 +1370,8 @@ nm_vpn_connection_ip6_config_get (DBusGProxy *proxy, static gboolean connect_timeout_cb (gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); priv->connect_timeout = 0; @@ -1387,9 +1387,9 @@ connect_timeout_cb (gpointer user_data) } static void -connect_success (NMVPNConnection *connection) +connect_success (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); /* 40 second timeout waiting for IP config signal from VPN service */ priv->connect_timeout = g_timeout_add_seconds (40, connect_timeout_cb, connection); @@ -1401,8 +1401,8 @@ connect_success (NMVPNConnection *connection) static void connect_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GError *err = NULL; nm_log_info (LOGD_VPN, "VPN connection '%s' (Connect) reply received.", @@ -1423,8 +1423,8 @@ connect_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) static void connect_interactive_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GError *err = NULL; nm_log_info (LOGD_VPN, "VPN connection '%s' (ConnectInteractive) reply received.", @@ -1455,7 +1455,7 @@ static GHashTable * _hash_with_username (NMConnection *connection, const char *username) { NMConnection *dup; - NMSettingVPN *s_vpn; + NMSettingVpn *s_vpn; GHashTable *hash; const char *existing; @@ -1479,9 +1479,9 @@ _hash_with_username (NMConnection *connection, const char *username) } static void -really_activate (NMVPNConnection *connection, const char *username) +really_activate (NMVpnConnection *connection, const char *username) { - NMVPNConnectionPrivate *priv; + NMVpnConnectionPrivate *priv; NMAgentManager *agent_mgr; GHashTable *details; @@ -1545,9 +1545,9 @@ really_activate (NMVPNConnection *connection, const char *username) } void -nm_vpn_connection_activate (NMVPNConnection *connection) +nm_vpn_connection_activate (NMVpnConnection *connection) { - NMVPNConnectionPrivate *priv; + NMVpnConnectionPrivate *priv; DBusGConnection *bus; g_return_if_fail (NM_IS_VPN_CONNECTION (connection)); @@ -1591,15 +1591,15 @@ nm_vpn_connection_activate (NMVPNConnection *connection) } NMConnection * -nm_vpn_connection_get_connection (NMVPNConnection *connection) +nm_vpn_connection_get_connection (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); return NM_VPN_CONNECTION_GET_PRIVATE (connection)->connection; } -NMVPNConnectionState -nm_vpn_connection_get_vpn_state (NMVPNConnection *connection) +NMVpnConnectionState +nm_vpn_connection_get_vpn_state (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NM_VPN_CONNECTION_STATE_UNKNOWN); @@ -1607,7 +1607,7 @@ nm_vpn_connection_get_vpn_state (NMVPNConnection *connection) } const char * -nm_vpn_connection_get_banner (NMVPNConnection *connection) +nm_vpn_connection_get_banner (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); @@ -1615,7 +1615,7 @@ nm_vpn_connection_get_banner (NMVPNConnection *connection) } NMIP4Config * -nm_vpn_connection_get_ip4_config (NMVPNConnection *connection) +nm_vpn_connection_get_ip4_config (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); @@ -1623,7 +1623,7 @@ nm_vpn_connection_get_ip4_config (NMVPNConnection *connection) } NMIP6Config * -nm_vpn_connection_get_ip6_config (NMVPNConnection *connection) +nm_vpn_connection_get_ip6_config (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); @@ -1631,7 +1631,7 @@ nm_vpn_connection_get_ip6_config (NMVPNConnection *connection) } const char * -nm_vpn_connection_get_ip_iface (NMVPNConnection *connection) +nm_vpn_connection_get_ip_iface (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), NULL); @@ -1639,7 +1639,7 @@ nm_vpn_connection_get_ip_iface (NMVPNConnection *connection) } int -nm_vpn_connection_get_ip_ifindex (NMVPNConnection *connection) +nm_vpn_connection_get_ip_ifindex (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), -1); @@ -1647,7 +1647,7 @@ nm_vpn_connection_get_ip_ifindex (NMVPNConnection *connection) } guint32 -nm_vpn_connection_get_ip4_internal_gateway (NMVPNConnection *connection) +nm_vpn_connection_get_ip4_internal_gateway (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), 0); @@ -1655,7 +1655,7 @@ nm_vpn_connection_get_ip4_internal_gateway (NMVPNConnection *connection) } struct in6_addr * -nm_vpn_connection_get_ip6_internal_gateway (NMVPNConnection *connection) +nm_vpn_connection_get_ip6_internal_gateway (NMVpnConnection *connection) { g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), 0); @@ -1663,8 +1663,8 @@ nm_vpn_connection_get_ip6_internal_gateway (NMVPNConnection *connection) } void -nm_vpn_connection_disconnect (NMVPNConnection *connection, - NMVPNConnectionStateReason reason, +nm_vpn_connection_disconnect (NMVpnConnection *connection, + NMVpnConnectionStateReason reason, gboolean quitting) { g_return_if_fail (NM_IS_VPN_CONNECTION (connection)); @@ -1673,11 +1673,11 @@ nm_vpn_connection_disconnect (NMVPNConnection *connection, } gboolean -nm_vpn_connection_deactivate (NMVPNConnection *connection, - NMVPNConnectionStateReason reason, +nm_vpn_connection_deactivate (NMVpnConnection *connection, + NMVpnConnectionStateReason reason, gboolean quitting) { - NMVPNConnectionPrivate *priv; + NMVpnConnectionPrivate *priv; gboolean success = FALSE; g_return_val_if_fail (NM_IS_VPN_CONNECTION (connection), FALSE); @@ -1695,8 +1695,8 @@ nm_vpn_connection_deactivate (NMVPNConnection *connection, static void plugin_need_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GError *error = NULL; char *setting_name; @@ -1744,8 +1744,8 @@ plugin_need_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_dat static void plugin_new_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GError *error = NULL; if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID)) { @@ -1767,8 +1767,8 @@ get_secrets_cb (NMSettingsConnection *connection, GError *error, gpointer user_data) { - NMVPNConnection *self = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnection *self = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); GHashTable *hash; g_return_if_fail (NM_CONNECTION (connection) == priv->connection); @@ -1816,11 +1816,11 @@ get_secrets_cb (NMSettingsConnection *connection, } static void -get_secrets (NMVPNConnection *self, +get_secrets (NMVpnConnection *self, SecretsReq secrets_idx, const char **hints) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); NMSettingsGetSecretsFlags flags = NM_SETTINGS_GET_SECRETS_FLAG_NONE; GError *error = NULL; @@ -1874,8 +1874,8 @@ plugin_interactive_secrets_required (DBusGProxy *proxy, const char **secrets, gpointer user_data) { - NMVPNConnection *connection = NM_VPN_CONNECTION (user_data); - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); + NMVpnConnection *connection = NM_VPN_CONNECTION (user_data); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (connection); guint32 secrets_len = secrets ? g_strv_length ((char **) secrets) : 0; char **hints; guint32 i; @@ -1903,9 +1903,9 @@ plugin_interactive_secrets_required (DBusGProxy *proxy, /******************************************************************************/ static void -nm_vpn_connection_init (NMVPNConnection *self) +nm_vpn_connection_init (NMVpnConnection *self) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (self); priv->vpn_state = STATE_WAITING; priv->secrets_idx = SECRETS_REQ_SYSTEM; @@ -1925,7 +1925,7 @@ constructed (GObject *object) static void dispose (GObject *object) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); if (priv->connect_hash) { g_hash_table_destroy (priv->connect_hash); @@ -1956,7 +1956,7 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); g_free (priv->banner); g_free (priv->ip_iface); @@ -1977,7 +1977,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMVPNConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); + NMVpnConnectionPrivate *priv = NM_VPN_CONNECTION_GET_PRIVATE (object); NMDevice *parent_dev; switch (prop_id) { @@ -2010,12 +2010,12 @@ get_property (GObject *object, guint prop_id, } static void -nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class) +nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class) { GObjectClass *object_class = G_OBJECT_CLASS (connection_class); NMActiveConnectionClass *active_class = NM_ACTIVE_CONNECTION_CLASS (connection_class); - g_type_class_add_private (connection_class, sizeof (NMVPNConnectionPrivate)); + g_type_class_add_private (connection_class, sizeof (NMVpnConnectionPrivate)); /* virtual methods */ object_class->get_property = get_property; diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 3b3ec1fb1e..10dee5a79c 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -30,11 +30,11 @@ #include "nm-active-connection.h" #define NM_TYPE_VPN_CONNECTION (nm_vpn_connection_get_type ()) -#define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnection)) -#define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) +#define NM_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_CONNECTION, NMVpnConnection)) +#define NM_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_CONNECTION, NMVpnConnectionClass)) #define NM_IS_VPN_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_CONNECTION)) #define NM_IS_VPN_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_CONNECTION)) -#define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVPNConnectionClass)) +#define NM_VPN_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_CONNECTION, NMVpnConnectionClass)) /* Properties */ #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" @@ -47,47 +47,47 @@ typedef struct { NMActiveConnection parent; -} NMVPNConnection; +} NMVpnConnection; typedef struct { NMActiveConnectionClass parent; /* Signals */ - void (*vpn_state_changed) (NMVPNConnection *connection, - NMVPNConnectionState new_state, - NMVPNConnectionStateReason reason); + void (*vpn_state_changed) (NMVpnConnection *connection, + NMVpnConnectionState new_state, + NMVpnConnectionStateReason reason); /* not exported over D-Bus */ - void (*internal_state_changed) (NMVPNConnection *connection, - NMVPNConnectionState new_state, - NMVPNConnectionState old_state, - NMVPNConnectionStateReason reason); -} NMVPNConnectionClass; + void (*internal_state_changed) (NMVpnConnection *connection, + NMVpnConnectionState new_state, + NMVpnConnectionState old_state, + NMVpnConnectionStateReason reason); +} NMVpnConnectionClass; GType nm_vpn_connection_get_type (void); -NMVPNConnection * nm_vpn_connection_new (NMConnection *connection, +NMVpnConnection * nm_vpn_connection_new (NMConnection *connection, NMDevice *parent_device, const char *specific_object, NMAuthSubject *subject); -void nm_vpn_connection_activate (NMVPNConnection *connection); -NMConnection * nm_vpn_connection_get_connection (NMVPNConnection *connection); -NMVPNConnectionState nm_vpn_connection_get_vpn_state (NMVPNConnection *connection); -const char * nm_vpn_connection_get_banner (NMVPNConnection *connection); +void nm_vpn_connection_activate (NMVpnConnection *connection); +NMConnection * nm_vpn_connection_get_connection (NMVpnConnection *connection); +NMVpnConnectionState nm_vpn_connection_get_vpn_state (NMVpnConnection *connection); +const char * nm_vpn_connection_get_banner (NMVpnConnection *connection); -gboolean nm_vpn_connection_deactivate (NMVPNConnection *connection, - NMVPNConnectionStateReason reason, +gboolean nm_vpn_connection_deactivate (NMVpnConnection *connection, + NMVpnConnectionStateReason reason, gboolean quitting); -void nm_vpn_connection_disconnect (NMVPNConnection *connection, - NMVPNConnectionStateReason reason, +void nm_vpn_connection_disconnect (NMVpnConnection *connection, + NMVpnConnectionStateReason reason, gboolean quitting); -NMIP4Config * nm_vpn_connection_get_ip4_config (NMVPNConnection *connection); -NMIP6Config * nm_vpn_connection_get_ip6_config (NMVPNConnection *connection); -const char * nm_vpn_connection_get_ip_iface (NMVPNConnection *connection); -int nm_vpn_connection_get_ip_ifindex (NMVPNConnection *connection); -guint32 nm_vpn_connection_get_ip4_internal_gateway (NMVPNConnection *connection); -struct in6_addr * nm_vpn_connection_get_ip6_internal_gateway (NMVPNConnection *connection); +NMIP4Config * nm_vpn_connection_get_ip4_config (NMVpnConnection *connection); +NMIP6Config * nm_vpn_connection_get_ip6_config (NMVpnConnection *connection); +const char * nm_vpn_connection_get_ip_iface (NMVpnConnection *connection); +int nm_vpn_connection_get_ip_ifindex (NMVpnConnection *connection); +guint32 nm_vpn_connection_get_ip4_internal_gateway (NMVpnConnection *connection); +struct in6_addr * nm_vpn_connection_get_ip6_internal_gateway (NMVpnConnection *connection); #endif /* NM_VPN_CONNECTION_H */ diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 5550d4d6c6..002a919a9d 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -33,15 +33,15 @@ #define VPN_NAME_FILES_DIR NMCONFDIR "/VPN" -G_DEFINE_TYPE (NMVPNManager, nm_vpn_manager, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMVpnManager, nm_vpn_manager, G_TYPE_OBJECT) -#define NM_VPN_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_MANAGER, NMVPNManagerPrivate)) +#define NM_VPN_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_MANAGER, NMVpnManagerPrivate)) typedef struct { GHashTable *services; GFileMonitor *monitor; guint monitor_id; -} NMVPNManagerPrivate; +} NMVpnManagerPrivate; GQuark nm_vpn_manager_error_quark (void) @@ -53,10 +53,10 @@ nm_vpn_manager_error_quark (void) } -static NMVPNService * -get_service_by_namefile (NMVPNManager *self, const char *namefile) +static NMVpnService * +get_service_by_namefile (NMVpnManager *self, const char *namefile) { - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); GHashTableIter iter; gpointer data; @@ -65,7 +65,7 @@ get_service_by_namefile (NMVPNManager *self, const char *namefile) g_hash_table_iter_init (&iter, priv->services); while (g_hash_table_iter_next (&iter, NULL, &data)) { - NMVPNService *candidate = NM_VPN_SERVICE (data); + NMVpnService *candidate = NM_VPN_SERVICE (data); const char *service_namefile; service_namefile = nm_vpn_service_get_name_file (candidate); @@ -76,13 +76,13 @@ get_service_by_namefile (NMVPNManager *self, const char *namefile) } gboolean -nm_vpn_manager_activate_connection (NMVPNManager *manager, - NMVPNConnection *vpn, +nm_vpn_manager_activate_connection (NMVpnManager *manager, + NMVpnConnection *vpn, GError **error) { NMConnection *connection; - NMSettingVPN *s_vpn; - NMVPNService *service; + NMSettingVpn *s_vpn; + NMVpnService *service; const char *service_name; NMDevice *device; @@ -119,18 +119,18 @@ nm_vpn_manager_activate_connection (NMVPNManager *manager, } gboolean -nm_vpn_manager_deactivate_connection (NMVPNManager *self, - NMVPNConnection *connection, - NMVPNConnectionStateReason reason) +nm_vpn_manager_deactivate_connection (NMVpnManager *self, + NMVpnConnection *connection, + NMVpnConnectionStateReason reason) { return nm_vpn_connection_deactivate (connection, reason, FALSE); } static void -try_add_service (NMVPNManager *self, const char *namefile) +try_add_service (NMVpnManager *self, const char *namefile) { - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); - NMVPNService *service = NULL; + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); + NMVpnService *service = NULL; GHashTableIter iter; GError *error = NULL; const char *service_name; @@ -166,9 +166,9 @@ vpn_dir_changed (GFileMonitor *monitor, GFileMonitorEvent event_type, gpointer user_data) { - NMVPNManager *self = NM_VPN_MANAGER (user_data); - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); - NMVPNService *service; + NMVpnManager *self = NM_VPN_MANAGER (user_data); + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); + NMVpnService *service; char *path; path = g_file_get_path (file); @@ -207,10 +207,10 @@ vpn_dir_changed (GFileMonitor *monitor, /******************************************************************************/ -NMVPNManager * +NMVpnManager * nm_vpn_manager_get (void) { - static NMVPNManager *singleton = NULL; + static NMVpnManager *singleton = NULL; if (!singleton) singleton = NM_VPN_MANAGER (g_object_new (NM_TYPE_VPN_MANAGER, NULL)); @@ -222,9 +222,9 @@ nm_vpn_manager_get (void) } static void -nm_vpn_manager_init (NMVPNManager *self) +nm_vpn_manager_init (NMVpnManager *self) { - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); GFile *file; GDir *dir; const char *fn; @@ -258,11 +258,11 @@ nm_vpn_manager_init (NMVPNManager *self) } static void -stop_all_services (NMVPNManager *self) +stop_all_services (NMVpnManager *self) { - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (self); GHashTableIter iter; - NMVPNService *service; + NMVpnService *service; g_hash_table_iter_init (&iter, priv->services); while (g_hash_table_iter_next (&iter, NULL, (gpointer) &service)) { @@ -275,7 +275,7 @@ stop_all_services (NMVPNManager *self) static void dispose (GObject *object) { - NMVPNManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (object); + NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE (object); if (priv->monitor) { if (priv->monitor_id) @@ -294,11 +294,11 @@ dispose (GObject *object) } static void -nm_vpn_manager_class_init (NMVPNManagerClass *manager_class) +nm_vpn_manager_class_init (NMVpnManagerClass *manager_class) { GObjectClass *object_class = G_OBJECT_CLASS (manager_class); - g_type_class_add_private (manager_class, sizeof (NMVPNManagerPrivate)); + g_type_class_add_private (manager_class, sizeof (NMVpnManagerPrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index 57f947b0e4..5cc4b30a1d 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -27,11 +27,11 @@ #include "nm-vpn-connection.h" #define NM_TYPE_VPN_MANAGER (nm_vpn_manager_get_type ()) -#define NM_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_MANAGER, NMVPNManager)) -#define NM_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_MANAGER, NMVPNManagerClass)) +#define NM_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_MANAGER, NMVpnManager)) +#define NM_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_MANAGER, NMVpnManagerClass)) #define NM_IS_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_MANAGER)) #define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_MANAGER)) -#define NM_VPN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_MANAGER, NMVPNManagerClass)) +#define NM_VPN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_MANAGER, NMVpnManagerClass)) typedef enum { @@ -39,7 +39,7 @@ typedef enum NM_VPN_MANAGER_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/ NM_VPN_MANAGER_ERROR_SERVICE_INVALID, /*< nick=ServiceInvalid >*/ NM_VPN_MANAGER_ERROR_SERVICE_START_FAILED, /*< nick=ServiceStartFailed >*/ -} NMVPNManagerError; +} NMVpnManagerError; #define NM_VPN_MANAGER_ERROR (nm_vpn_manager_error_quark ()) @@ -49,22 +49,22 @@ GType nm_vpn_manager_error_get_type (void); typedef struct { GObject parent; -} NMVPNManager; +} NMVpnManager; typedef struct { GObjectClass parent; -} NMVPNManagerClass; +} NMVpnManagerClass; GType nm_vpn_manager_get_type (void); -NMVPNManager *nm_vpn_manager_get (void); +NMVpnManager *nm_vpn_manager_get (void); -gboolean nm_vpn_manager_activate_connection (NMVPNManager *manager, - NMVPNConnection *vpn, +gboolean nm_vpn_manager_activate_connection (NMVpnManager *manager, + NMVpnConnection *vpn, GError **error); -gboolean nm_vpn_manager_deactivate_connection (NMVPNManager *manager, - NMVPNConnection *connection, - NMVPNConnectionStateReason reason); +gboolean nm_vpn_manager_deactivate_connection (NMVpnManager *manager, + NMVpnConnection *connection, + NMVpnConnectionStateReason reason); #endif /* NM_VPN_MANAGER_H */ diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index 824543fa41..7ac14de868 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -35,7 +35,7 @@ #include "nm-vpn-manager.h" #include "nm-glib-compat.h" -G_DEFINE_TYPE (NMVPNService, nm_vpn_service, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMVpnService, nm_vpn_service, G_TYPE_OBJECT) typedef struct { char *name; @@ -43,24 +43,24 @@ typedef struct { char *program; char *namefile; - NMVPNConnection *active; + NMVpnConnection *active; GSList *pending; guint start_timeout; gboolean service_running; -} NMVPNServicePrivate; +} NMVpnServicePrivate; -#define NM_VPN_SERVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_SERVICE, NMVPNServicePrivate)) +#define NM_VPN_SERVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_VPN_SERVICE, NMVpnServicePrivate)) #define VPN_CONNECTION_GROUP "VPN Connection" -static gboolean start_pending_vpn (NMVPNService *self); +static gboolean start_pending_vpn (NMVpnService *self); -NMVPNService * +NMVpnService * nm_vpn_service_new (const char *namefile, GError **error) { - NMVPNService *self; - NMVPNServicePrivate *priv; + NMVpnService *self; + NMVpnServicePrivate *priv; GKeyFile *kf; g_return_val_if_fail (namefile != NULL, NULL); @@ -72,7 +72,7 @@ nm_vpn_service_new (const char *namefile, GError **error) return NULL; } - self = (NMVPNService *) g_object_new (NM_TYPE_VPN_SERVICE, NULL); + self = (NMVpnService *) g_object_new (NM_TYPE_VPN_SERVICE, NULL); priv = NM_VPN_SERVICE_GET_PRIVATE (self); priv->namefile = g_strdup (namefile); @@ -100,7 +100,7 @@ error: } const char * -nm_vpn_service_get_dbus_service (NMVPNService *service) +nm_vpn_service_get_dbus_service (NMVpnService *service) { g_return_val_if_fail (NM_IS_VPN_SERVICE (service), NULL); @@ -108,7 +108,7 @@ nm_vpn_service_get_dbus_service (NMVPNService *service) } const char * -nm_vpn_service_get_name_file (NMVPNService *service) +nm_vpn_service_get_name_file (NMVpnService *service) { g_return_val_if_fail (NM_IS_VPN_SERVICE (service), NULL); @@ -116,14 +116,14 @@ nm_vpn_service_get_name_file (NMVPNService *service) } static void -connection_vpn_state_changed (NMVPNConnection *connection, - NMVPNConnectionState new_state, - NMVPNConnectionState old_state, - NMVPNConnectionStateReason reason, +connection_vpn_state_changed (NMVpnConnection *connection, + NMVpnConnectionState new_state, + NMVpnConnectionState old_state, + NMVpnConnectionStateReason reason, gpointer user_data) { - NMVPNService *self = NM_VPN_SERVICE (user_data); - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); + NMVpnService *self = NM_VPN_SERVICE (user_data); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); if (new_state == NM_VPN_CONNECTION_STATE_FAILED || new_state == NM_VPN_CONNECTION_STATE_DISCONNECTED) { @@ -138,11 +138,11 @@ connection_vpn_state_changed (NMVPNConnection *connection, } void -nm_vpn_service_stop_connections (NMVPNService *service, +nm_vpn_service_stop_connections (NMVpnService *service, gboolean quitting, - NMVPNConnectionStateReason reason) + NMVpnConnectionStateReason reason) { - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); GSList *iter; /* Just add priv->active to the beginning of priv->pending, @@ -154,7 +154,7 @@ nm_vpn_service_stop_connections (NMVPNService *service, } for (iter = priv->pending; iter; iter = iter->next) { - NMVPNConnection *vpn = NM_VPN_CONNECTION (iter->data); + NMVpnConnection *vpn = NM_VPN_CONNECTION (iter->data); g_signal_handlers_disconnect_by_func (vpn, G_CALLBACK (connection_vpn_state_changed), service); if (quitting) { @@ -184,8 +184,8 @@ _daemon_setup (gpointer user_data G_GNUC_UNUSED) static gboolean _daemon_exec_timeout (gpointer data) { - NMVPNService *self = NM_VPN_SERVICE (data); - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); + NMVpnService *self = NM_VPN_SERVICE (data); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); nm_log_warn (LOGD_VPN, "VPN service '%s' start timed out", priv->name); priv->start_timeout = 0; @@ -194,9 +194,9 @@ _daemon_exec_timeout (gpointer data) } static gboolean -nm_vpn_service_daemon_exec (NMVPNService *service, GError **error) +nm_vpn_service_daemon_exec (NMVpnService *service, GError **error) { - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); GPid pid; char *vpn_argv[2]; gboolean success = FALSE; @@ -231,9 +231,9 @@ nm_vpn_service_daemon_exec (NMVPNService *service, GError **error) } static gboolean -start_active_vpn (NMVPNService *self, GError **error) +start_active_vpn (NMVpnService *self, GError **error) { - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); if (!priv->active) return TRUE; @@ -253,9 +253,9 @@ start_active_vpn (NMVPNService *self, GError **error) } static gboolean -start_pending_vpn (NMVPNService *self) +start_pending_vpn (NMVpnService *self) { - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); g_assert (priv->active == NULL); @@ -270,11 +270,11 @@ start_pending_vpn (NMVPNService *self) } gboolean -nm_vpn_service_activate (NMVPNService *service, - NMVPNConnection *vpn, +nm_vpn_service_activate (NMVpnService *service, + NMVpnConnection *vpn, GError **error) { - NMVPNServicePrivate *priv; + NMVpnServicePrivate *priv; g_return_val_if_fail (NM_IS_VPN_SERVICE (service), FALSE); g_return_val_if_fail (NM_IS_VPN_CONNECTION (vpn), FALSE); @@ -310,8 +310,8 @@ _name_owner_changed (NMDBusManager *mgr, const char *new, gpointer user_data) { - NMVPNService *service = NM_VPN_SERVICE (user_data); - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); + NMVpnService *service = NM_VPN_SERVICE (user_data); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (service); gboolean old_owner_good, new_owner_good, success; if (strcmp (name, priv->dbus_service)) @@ -344,7 +344,7 @@ _name_owner_changed (NMDBusManager *mgr, /******************************************************************************/ static void -nm_vpn_service_init (NMVPNService *self) +nm_vpn_service_init (NMVpnService *self) { g_signal_connect (nm_dbus_manager_get (), NM_DBUS_MANAGER_NAME_OWNER_CHANGED, @@ -355,8 +355,8 @@ nm_vpn_service_init (NMVPNService *self) static void dispose (GObject *object) { - NMVPNService *self = NM_VPN_SERVICE (object); - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); + NMVpnService *self = NM_VPN_SERVICE (object); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (self); if (priv->start_timeout) { g_source_remove (priv->start_timeout); @@ -377,7 +377,7 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMVPNServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (object); + NMVpnServicePrivate *priv = NM_VPN_SERVICE_GET_PRIVATE (object); g_free (priv->name); g_free (priv->dbus_service); @@ -388,11 +388,11 @@ finalize (GObject *object) } static void -nm_vpn_service_class_init (NMVPNServiceClass *service_class) +nm_vpn_service_class_init (NMVpnServiceClass *service_class) { GObjectClass *object_class = G_OBJECT_CLASS (service_class); - g_type_class_add_private (service_class, sizeof (NMVPNServicePrivate)); + g_type_class_add_private (service_class, sizeof (NMVpnServicePrivate)); /* virtual methods */ object_class->dispose = dispose; diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index 4545d1f07d..84d7dc8c51 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -28,36 +28,36 @@ #include "nm-vpn-connection.h" #define NM_TYPE_VPN_SERVICE (nm_vpn_service_get_type ()) -#define NM_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_SERVICE, NMVPNService)) -#define NM_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_SERVICE, NMVPNServiceClass)) +#define NM_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_SERVICE, NMVpnService)) +#define NM_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_SERVICE, NMVpnServiceClass)) #define NM_IS_VPN_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_SERVICE)) #define NM_IS_VPN_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_SERVICE)) -#define NM_VPN_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_SERVICE, NMVPNServiceClass)) +#define NM_VPN_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_SERVICE, NMVpnServiceClass)) typedef struct { GObject parent; -} NMVPNService; +} NMVpnService; typedef struct { GObjectClass parent; -} NMVPNServiceClass; +} NMVpnServiceClass; GType nm_vpn_service_get_type (void); -NMVPNService * nm_vpn_service_new (const char *namefile, GError **error); +NMVpnService * nm_vpn_service_new (const char *namefile, GError **error); /* Returns the VPN service's D-Bus service name */ -const char *nm_vpn_service_get_dbus_service (NMVPNService *service); +const char *nm_vpn_service_get_dbus_service (NMVpnService *service); /* Returns the path of the VPN service's .name file */ -const char *nm_vpn_service_get_name_file (NMVPNService *service); +const char *nm_vpn_service_get_name_file (NMVpnService *service); -gboolean nm_vpn_service_activate (NMVPNService *service, - NMVPNConnection *vpn, +gboolean nm_vpn_service_activate (NMVpnService *service, + NMVpnConnection *vpn, GError **error); -void nm_vpn_service_stop_connections (NMVPNService *service, +void nm_vpn_service_stop_connections (NMVpnService *service, gboolean quitting, - NMVPNConnectionStateReason reason); + NMVpnConnectionStateReason reason); #endif /* NM_VPN_VPN_SERVICE_H */ |