colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: VPN delete and save secrets operations are no longer used

Browse Source 
They don't get called by anything since 0.9 reworked secrets handling
and added secret agents.  Make them nops but keep the functions.
This commit is contained in:
Dan Williams
2011-07-13 12:57:28 -05:00
parent c3893b5325
commit 70aba9a038
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libnm-glib/nm-vpn-plugin-ui-interface.c
View File

@@ -150,12 +150,8 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), FALSE); /* Deprecated and no longer used */
return TRUE;
if (error)
g_return_val_if_fail (*error == NULL, FALSE);
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->delete_connection (iface, connection, error);
} }
@@ -235,11 +231,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *if
NMConnection *connection, NMConnection *connection,
GError **error) GError **error)
{ {
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE (iface), FALSE); /* Deprecated and no longer used */
return TRUE;
if (error)
g_return_val_if_fail (*error == NULL, FALSE);
return NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE (iface)->save_secrets (iface, connection, error);
} }

14
libnm-glib/nm-vpn-plugin-ui-interface.h
View File

@@ -111,11 +111,7 @@ struct _NMVpnPluginUiInterface {
*/ */
char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection); char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
/* Called when the user has chosen to remove the connection (for user /* Deprecated and no longer used */
* connections only; system connections are handled by the system
* settings service). Should clear out any VPN-specific secrets or data
* related to the connection.
*/
gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error); gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
/* Padding for future expansion */ /* Padding for future expansion */
@@ -147,6 +143,7 @@ gboolean nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
char *nm_vpn_plugin_ui_interface_get_suggested_name (NMVpnPluginUiInterface *iface, char *nm_vpn_plugin_ui_interface_get_suggested_name (NMVpnPluginUiInterface *iface,
NMConnection *connection); NMConnection *connection);
/* Deprecated and no longer used */
gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface, gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
NMConnection *connection, NMConnection *connection,
GError **error); GError **error);
@@ -178,11 +175,7 @@ struct _NMVpnPluginUiWidgetInterface {
NMConnection *connection, NMConnection *connection,
GError **error); GError **error);
/* Called when the user has chosen to save the connection (for user /* Deprecated and no longer used */
* connections only; system connections are handled by the system
* settings service). Should save VPN-specific connection secrets in
* a way that the auth-dialog can read them.
*/
gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface, gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
NMConnection *connection, NMConnection *connection,
GError **error); GError **error);
@@ -200,6 +193,7 @@ gboolean nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidge
NMConnection *connection, NMConnection *connection,
GError **error); GError **error);
/* Deprecated and no longer used */
gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface, gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface,
NMConnection *connection, NMConnection *connection,
GError **error); GError **error);