libnm-glib: VPN delete and save secrets operations are no longer used
authorDan Williams <dcbw@redhat.com>
Wed, 13 Jul 2011 17:57:28 +0000 (12:57 -0500)
committerDan Williams <dcbw@redhat.com>
Wed, 13 Jul 2011 18:00:16 +0000 (13:00 -0500)
They don't get called by anything since 0.9 reworked secrets handling
and added secret agents.  Make them nops but keep the functions.

libnm-glib/nm-vpn-plugin-ui-interface.c
libnm-glib/nm-vpn-plugin-ui-interface.h

index f4b844c..f82c127 100644 (file)
@@ -150,12 +150,8 @@ nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
                                               NMConnection *connection,
                                               GError **error)
 {
-       g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), FALSE);
-
-       if (error)
-               g_return_val_if_fail (*error == NULL, FALSE);
-
-       return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->delete_connection (iface, connection, error);
+       /* Deprecated and no longer used */
+       return TRUE;
 }
 
 
@@ -235,11 +231,7 @@ nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *if
                                                 NMConnection *connection,
                                                 GError **error)
 {
-       g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE (iface), FALSE);
-
-       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);
+       /* Deprecated and no longer used */
+       return TRUE;
 }
 
index 2ab13f0..93c5659 100644 (file)
@@ -111,11 +111,7 @@ struct _NMVpnPluginUiInterface {
         */
        char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
 
-       /* Called when the user has chosen to remove the connection (for user
-        * connections only; system connections are handled by the system
-        * settings service).  Should clear out any VPN-specific secrets or data
-        * related to the connection.
-        */
+       /* Deprecated and no longer used */
        gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
 
        /* 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,
                                                      NMConnection *connection);
 
+/* Deprecated and no longer used */
 gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
                                                        NMConnection *connection,
                                                        GError **error);
@@ -178,11 +175,7 @@ struct _NMVpnPluginUiWidgetInterface {
                                       NMConnection *connection,
                                       GError **error);
 
-       /* Called when the user has chosen to save the connection (for user
-        * 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.
-        */
+       /* Deprecated and no longer used */
        gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
                                  NMConnection *connection,
                                  GError **error);
@@ -200,6 +193,7 @@ gboolean nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidge
                                                               NMConnection *connection,
                                                               GError **error);
 
+/* Deprecated and no longer used */
 gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface,
                                                          NMConnection *connection,
                                                          GError **error);