summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-04-05 20:22:25 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-04-05 20:39:18 +0200
commit1ef75e657af69da0f263a222463516bf0076a978 (patch)
tree62b8495411042d8c1fe6427966d3835f2bc06283
parent29cfb144a8cdfce697c63175b1bfa36e0d95a6ad (diff)
downloadNetworkManager-1ef75e657af69da0f263a222463516bf0076a978.tar.gz
libnm-core/settings-wimax: undeprecate wimax settings
We can't stop supporting those
-rw-r--r--libnm-core/nm-setting-wimax.c10
-rw-r--r--libnm-core/nm-setting-wimax.h4
2 files changed, 0 insertions, 14 deletions
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c
index f893cbdcfe..d55ef2be92 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -67,8 +67,6 @@ enum {
* Creates a new #NMSettingWimax object with default values.
*
* Returns: the new empty #NMSettingWimax object
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
**/
NMSetting *
nm_setting_wimax_new (void)
@@ -84,8 +82,6 @@ nm_setting_wimax_new (void)
* specific WiMAX network this setting describes a connection to.
*
* Returns: the WiMAX NSP name
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
**/
const char *
nm_setting_wimax_get_network_name (NMSettingWimax *setting)
@@ -103,8 +99,6 @@ nm_setting_wimax_get_network_name (NMSettingWimax *setting)
* to.
*
* Returns: the MAC address
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
**/
const char *
nm_setting_wimax_get_mac_address (NMSettingWimax *setting)
@@ -226,8 +220,6 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class)
*
* Network Service Provider (NSP) name of the WiMAX network this connection
* should use.
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
**/
g_object_class_install_property
(object_class, PROP_NETWORK_NAME,
@@ -242,8 +234,6 @@ nm_setting_wimax_class_init (NMSettingWimaxClass *setting_class)
* If specified, this connection will only apply to the WiMAX device whose
* MAC address matches. This property does not change the MAC address of the
* device (known as MAC spoofing).
- *
- * Deprecated: 1.2: WiMAX is no longer supported.
**/
g_object_class_install_property
(object_class, PROP_MAC_ADDRESS,
diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h
index 0a98fbb5c5..0a58504669 100644
--- a/libnm-core/nm-setting-wimax.h
+++ b/libnm-core/nm-setting-wimax.h
@@ -53,14 +53,10 @@ typedef struct {
gpointer padding[4];
} NMSettingWimaxClass;
-NM_DEPRECATED_IN_1_2
GType nm_setting_wimax_get_type (void);
-NM_DEPRECATED_IN_1_2
NMSetting *nm_setting_wimax_new (void);
-NM_DEPRECATED_IN_1_2
const char *nm_setting_wimax_get_network_name (NMSettingWimax *setting);
-NM_DEPRECATED_IN_1_2
const char *nm_setting_wimax_get_mac_address (NMSettingWimax *setting);
G_END_DECLS