libnm: remove all deprecated functions and types

Remove deprecated functions and enum types.

For now, deprecated properties are still around, because removing them
would cause warnings when talking to older implementations.

8 files changed, 4 insertions, 89 deletions

diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index aed087d6ed..639f0c914c 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -5,7 +5,6 @@ global:
 	nm_access_point_get_bssid;
 	nm_access_point_get_flags;
 	nm_access_point_get_frequency;
-	nm_access_point_get_hw_address;
 	nm_access_point_get_max_bitrate;
 	nm_access_point_get_mode;
 	nm_access_point_get_rsn_flags;
@@ -61,7 +60,6 @@ global:
 	nm_client_permission_get_type;
 	nm_client_permission_result_get_type;
 	nm_client_set_logging;
-	nm_client_sleep;
 	nm_client_wimax_get_enabled;
 	nm_client_wimax_hardware_get_enabled;
 	nm_client_wimax_set_enabled;
@@ -595,11 +593,9 @@ global:
 	nm_setting_get_virtual_iface_name;
 	nm_setting_gsm_error_get_type;
 	nm_setting_gsm_error_quark;
-	nm_setting_gsm_get_allowed_bands;
 	nm_setting_gsm_get_apn;
 	nm_setting_gsm_get_home_only;
 	nm_setting_gsm_get_network_id;
-	nm_setting_gsm_get_network_type;
 	nm_setting_gsm_get_number;
 	nm_setting_gsm_get_password;
 	nm_setting_gsm_get_password_flags;
@@ -607,8 +603,6 @@ global:
 	nm_setting_gsm_get_pin_flags;
 	nm_setting_gsm_get_type;
 	nm_setting_gsm_get_username;
-	nm_setting_gsm_network_band_get_type;
-	nm_setting_gsm_network_type_get_type;
 	nm_setting_gsm_new;
 	nm_setting_hash_flags_get_type;
 	nm_setting_infiniband_error_get_type;
@@ -840,7 +834,6 @@ global:
 	nm_setting_wireless_get_num_mac_blacklist_items;
 	nm_setting_wireless_get_num_seen_bssids;
 	nm_setting_wireless_get_rate;
-	nm_setting_wireless_get_security;
 	nm_setting_wireless_get_seen_bssid;
 	nm_setting_wireless_get_ssid;
 	nm_setting_wireless_get_tx_power;
@@ -885,7 +878,6 @@ global:
 	nm_ssid_get_type;
 	nm_string_array_get_type;
 	nm_uint_array_get_type;
-	nm_util_get_private;
 	nm_utils_ap_mode_security_valid;
 	nm_utils_bin2hexstr;
 	nm_utils_check_virtual_device_compatibility;
@@ -902,7 +894,6 @@ global:
 	nm_utils_hwaddr_len;
 	nm_utils_hwaddr_ntoa;
 	nm_utils_hwaddr_ntoa_len;
-	nm_utils_hwaddr_type;
 	nm_utils_hwaddr_valid;
 	nm_utils_iface_valid_name;
 	nm_utils_inet4_ntop;
@@ -928,7 +919,6 @@ global:
 	nm_utils_same_ssid;
 	nm_utils_security_type_get_type;
 	nm_utils_security_valid;
-	nm_utils_slist_free;
 	nm_utils_ssid_to_utf8;
 	nm_utils_uuid_generate;
 	nm_utils_uuid_generate_from_string;
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index b462a6b169..bd02fb584e 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -197,23 +197,6 @@ nm_access_point_get_bssid (NMAccessPoint *ap)
 }
 
 /**
- * nm_access_point_get_hw_address:
- * @ap: a #NMAccessPoint
- *
- * Gets the hardware (MAC) address of the access point.
- *
- * Returns: the hardware address of the access point. This is the internal string used by the
- * access point and must not be modified.
- *
- * Deprecated: 0.9: Use nm_access_point_get_bssid() instead.
- **/
-const char *
-nm_access_point_get_hw_address (NMAccessPoint *ap)
-{
-	return nm_access_point_get_bssid (ap);
-}
-
-/**
  * nm_access_point_get_mode:
  * @ap: a #NMAccessPoint
  *
@@ -507,6 +490,7 @@ register_properties (NMAccessPoint *ap)
 		{ NM_ACCESS_POINT_RSN_FLAGS,   &priv->rsn_flags },
 		{ NM_ACCESS_POINT_SSID,        &priv->ssid, demarshal_ssid },
 		{ NM_ACCESS_POINT_FREQUENCY,   &priv->frequency },
+		/* The D-Bus property is HwAddress, but the GObject property is "bssid" */
 		{ NM_ACCESS_POINT_HW_ADDRESS,  &priv->bssid },
 		{ NM_ACCESS_POINT_MODE,        &priv->mode },
 		{ NM_ACCESS_POINT_MAX_BITRATE, &priv->max_bitrate },
@@ -624,7 +608,9 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
 	/**
 	 * NMAccessPoint:hw-address:
 	 *
-	 * The hardware address of the access point.
+	 * Alias for #NMAccessPoint:bssid.
+	 *
+	 * Deprecated: 1.0: use #NMAccessPoint:bssid.
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_HW_ADDRESS,
diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index d3150f8eee..df62c7cc5b 100644
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -87,10 +87,6 @@ GSList *               nm_access_point_filter_connections (NMAccessPoint *ap,
 gboolean               nm_access_point_connection_valid   (NMAccessPoint *ap,
                                                            NMConnection *connection);
 
-/* DEPRECATED */
-NM_DEPRECATED_IN_0_9_10
-const char *           nm_access_point_get_hw_address   (NMAccessPoint *ap);
-
 G_END_DECLS
 
 #endif /* NM_ACCESS_POINT_H */
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 8a17858cbf..3c42160054 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -1088,19 +1088,6 @@ nm_client_networking_set_enabled (NMClient *client, gboolean enable)
 }
 
 /**
- * nm_client_sleep:
- * @client: a #NMClient
- * @sleep_: %TRUE to put the daemon to sleep
- *
- * Deprecated; use nm_client_networking_set_enabled() instead.
- **/
-void
-nm_client_sleep (NMClient *client, gboolean sleep_)
-{
-	nm_client_networking_set_enabled (client, !sleep_);
-}
-
-/**
  * nm_client_get_manager_running:
  * @client: a #NMClient
  *
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index ffe513cb03..0e9ec4e7a3 100644
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -226,7 +226,6 @@ NM_AVAILABLE_IN_0_9_10
 gboolean  nm_client_get_startup          (NMClient *client);
 gboolean  nm_client_get_manager_running  (NMClient *client);
 const GPtrArray *nm_client_get_active_connections (NMClient *client);
-void      nm_client_sleep                (NMClient *client, gboolean sleep_);
 
 NMClientPermissionResult nm_client_get_permission_result (NMClient *client,
                                                           NMClientPermission permission);
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index 707fddf82a..87bc14fe37 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -177,10 +177,6 @@ gboolean             nm_device_connection_compatible (NMDevice *device,
 NM_AVAILABLE_IN_0_9_10
 GType                nm_device_get_setting_type     (NMDevice *device);
 
-/* Deprecated */
-NM_DEPRECATED_IN_1_0
-typedef void (*NMDeviceDeactivateFn) (NMDevice *device, GError *error, gpointer user_data);
-
 G_END_DECLS
 
 #endif /* NM_DEVICE_H */
diff --git a/libnm/nm-vpn-plugin-ui-interface.c b/libnm/nm-vpn-plugin-ui-interface.c
index a4a10836e8..71c374cb4e 100644
--- a/libnm/nm-vpn-plugin-ui-interface.c
+++ b/libnm/nm-vpn-plugin-ui-interface.c
@@ -156,15 +156,6 @@ nm_vpn_plugin_ui_interface_get_suggested_name (NMVpnPluginUiInterface *iface,
 	return NULL;
 }
 
-gboolean
-nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
-                                              NMConnection *connection,
-                                              GError **error)
-{
-	/* Deprecated and no longer used */
-	return TRUE;
-}
-
 
 static void
 widget_interface_init (gpointer g_iface)
@@ -236,12 +227,3 @@ nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidgetInterfac
 
 	return NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE (iface)->update_connection (iface, connection, error);
 }
-
-gboolean
-nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface,
-                                                NMConnection *connection,
-                                                GError **error)
-{
-	/* Deprecated and no longer used */
-	return TRUE;
-}
diff --git a/libnm/nm-vpn-plugin-ui-interface.h b/libnm/nm-vpn-plugin-ui-interface.h
index 9c6e49ebe6..d29d93794e 100644
--- a/libnm/nm-vpn-plugin-ui-interface.h
+++ b/libnm/nm-vpn-plugin-ui-interface.h
@@ -135,9 +135,6 @@ struct _NMVpnPluginUiInterface {
 	 */
 	char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection);
 
-	/* Deprecated and no longer used */
-	gboolean (*delete_connection) (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **error);
-
 	/* Padding for future expansion */
 	void (*_reserved1) (void);
 	void (*_reserved2) (void);
@@ -167,13 +164,6 @@ 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 */
-NM_DEPRECATED_IN_0_9_10
-gboolean nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
-                                                       NMConnection *connection,
-                                                       GError **error);
-
-
 /**************************************************/
 /* UI widget interface                            */
 /**************************************************/
@@ -200,11 +190,6 @@ struct _NMVpnPluginUiWidgetInterface {
 	                               NMConnection *connection,
 	                               GError **error);
 
-	/* Deprecated and no longer used */
-	gboolean (*save_secrets) (NMVpnPluginUiWidgetInterface *iface,
-	                          NMConnection *connection,
-	                          GError **error);
-
 	/* Emitted when the value of a UI widget changes.  May trigger a validity
 	 * check via update_connection() to write values to the connection */
 	void (*changed) (NMVpnPluginUiWidgetInterface *iface);
@@ -218,12 +203,6 @@ gboolean nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidge
                                                               NMConnection *connection,
                                                               GError **error);
 
-/* Deprecated and no longer used */
-NM_DEPRECATED_IN_0_9_10
-gboolean nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface,
-                                                         NMConnection *connection,
-                                                         GError **error);
-
 G_END_DECLS
 
 #endif	/* NM_VPN_PLUGIN_UI_INTERFACE_H */