summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2015-08-21 18:56:47 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2015-08-25 10:23:57 +0200
commit0bc335cfbee754b472686cbad96cb6ad6d9c6a0a (patch)
tree48d66eca602129b7c2da1685d9746696a7ee0dd4
parent0969d16ad86367eb035e384cc539fcc74d4e006b (diff)
downloadNetworkManager-0bc335cfbee754b472686cbad96cb6ad6d9c6a0a.tar.gz
libnm: backport NMSettingWired Wake-on-LAN symbols to 1.0.6
Backport to 1.0.6 the following symbols: - nm_setting_wired_get_wake_on_lan - nm_setting_wired_get_wake_on_lan_password - nm_setting_wired_wake_on_lan_get_type added to 1.0.6 with commit d449d823046ac02f19d086575a19be7f40278bd0
-rw-r--r--libnm-core/nm-setting-wired.c6
-rw-r--r--libnm/libnm.ver3
2 files changed, 9 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index 0a92f8e849..8dc823d562 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -575,6 +575,8 @@ nm_setting_wired_get_wake_on_lan (NMSettingWired *setting)
return NM_SETTING_WIRED_GET_PRIVATE (setting)->wol;
}
+NM_BACKPORT_SYMBOL (libnm_1_0_6, NMSettingWiredWakeOnLan, nm_setting_wired_get_wake_on_lan,
+ (NMSettingWired *setting), (setting));
/**
* nm_setting_wired_get_wake_on_lan_password:
@@ -594,6 +596,10 @@ nm_setting_wired_get_wake_on_lan_password (NMSettingWired *setting)
return NM_SETTING_WIRED_GET_PRIVATE (setting)->wol_password;
}
+NM_BACKPORT_SYMBOL (libnm_1_0_6, const char *, nm_setting_wired_get_wake_on_lan_password,
+ (NMSettingWired *setting), (setting));
+
+NM_BACKPORT_SYMBOL (libnm_1_0_6, GType, nm_setting_wired_wake_on_lan_get_type, (void), ());
static gboolean
verify (NMSetting *setting, NMConnection *connection, GError **error)
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 5ad41c24f5..fc05359b31 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -846,6 +846,9 @@ libnm_1_0_6 {
#nm_device_wifi_request_scan_options_async@libnm_1_0_6;
#nm_metered_get_type@libnm_1_0_6;
#nm_setting_connection_get_metered@libnm_1_0_6;
+ #nm_setting_wired_get_wake_on_lan@libnm_1_0_6;
+ #nm_setting_wired_get_wake_on_lan_password@libnm_1_0_6;
+ #nm_setting_wired_wake_on_lan_get_type@libnm_1_0_6;
#nm_utils_enum_from_str@libnm_1_0_6;
#nm_utils_enum_to_str@libnm_1_0_6;
#nm_utils_wifi_2ghz_freqs@libnm_1_0_6;