diff --git a/src/libnm-client-impl/nm-vpn-plugin-old.c b/src/libnm-client-impl/nm-vpn-plugin-old.c index 19ba2bb094..8898f09a29 100644 --- a/src/libnm-client-impl/nm-vpn-plugin-old.c +++ b/src/libnm-client-impl/nm-vpn-plugin-old.c @@ -281,13 +281,8 @@ schedule_fail_stop(NMVpnPluginOld *plugin, guint timeout_secs) priv->fail_stop_id = g_idle_add(fail_stop, plugin); } -/** - * nm_vpn_plugin_old_set_config: - * - * Deprecated: 1.2: Replaced by NMVpnServicePlugin. - */ -void -nm_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config) +static void +set_config(NMVpnPluginOld *plugin, GVariant *config) { NMVpnPluginOldPrivate *priv = NM_VPN_PLUGIN_OLD_GET_PRIVATE(plugin); @@ -382,13 +377,8 @@ nm_vpn_plugin_old_set_ip4_config(NMVpnPluginOld *plugin, GVariant *ip4_config) nm_vpn_plugin_old_set_state(plugin, NM_VPN_SERVICE_STATE_STARTED); } -/** - * nm_vpn_plugin_old_set_ip6_config: - * - * Deprecated: 1.2: Replaced by NMVpnServicePlugin. - */ -void -nm_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config) +static void +set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config) { NMVpnPluginOldPrivate *priv = NM_VPN_PLUGIN_OLD_GET_PRIVATE(plugin); @@ -721,7 +711,7 @@ impl_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config, gpointer user_data) { - nm_vpn_plugin_old_set_config(plugin, config); + set_config(plugin, config); g_dbus_method_invocation_return_value(context, NULL); } @@ -741,7 +731,7 @@ impl_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *config, gpointer user_data) { - nm_vpn_plugin_old_set_ip6_config(plugin, config); + set_ip6_config(plugin, config); g_dbus_method_invocation_return_value(context, NULL); } diff --git a/src/libnm-client-public/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h index fe0d4bc2cd..cc6f61787e 100644 --- a/src/libnm-client-public/nm-vpn-plugin-old.h +++ b/src/libnm-client-public/nm-vpn-plugin-old.h @@ -107,15 +107,9 @@ void nm_vpn_plugin_old_set_login_banner(NMVpnPluginOld *plugin, const char *bann NM_DEPRECATED_IN_1_2 void nm_vpn_plugin_old_failure(NMVpnPluginOld *plugin, NMVpnPluginFailure reason); -NM_DEPRECATED_IN_1_2 -void nm_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config); - NM_DEPRECATED_IN_1_2 void nm_vpn_plugin_old_set_ip4_config(NMVpnPluginOld *plugin, GVariant *ip4_config); -NM_DEPRECATED_IN_1_2 -void nm_vpn_plugin_old_set_ip6_config(NMVpnPluginOld *plugin, GVariant *ip6_config); - NM_DEPRECATED_IN_1_2 gboolean nm_vpn_plugin_old_disconnect(NMVpnPluginOld *plugin, GError **err);