diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-08-14 14:24:16 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-08-14 14:29:05 +0200 |
| commit | acfa07a37d380185a16c4a8ab2910ebfd905bd5b (patch) | |
| tree | 7371a5c7c477bd8aa1bb88a694ced9c9a0629868 | |
| parent | 32c34a8ccda0d26aa36a5556bacdcf36bf522f0b (diff) | |
| download | NetworkManager-acfa07a37d380185a16c4a8ab2910ebfd905bd5b.tar.gz | |
libnm: symbols for request scanning backported to 1.0.6
Backport to 1.0.6 the following symbols:
- nm_device_wifi_request_scan_options
- nm_device_wifi_request_scan_options_async
Backported by commit 91c0555afaac57234744f42024d95bde46ba170e
| -rw-r--r-- | libnm/libnm.ver | 2 | ||||
| -rw-r--r-- | libnm/nm-device-wifi.c | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 725b3e5e8a..ee23ad06e2 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -842,6 +842,8 @@ libnm_1_0_4 { libnm_1_0_6 { #nm_access_point_get_last_seen@libnm_1_0_6; #nm_device_get_metered@libnm_1_0_6; + #nm_device_wifi_request_scan_options@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; } libnm_1_0_4; diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 383f43c60b..9019e0384d 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -36,6 +36,7 @@ #include "nm-object-cache.h" #include "nm-core-internal.h" #include "nm-dbus-helpers.h" +#include "nm-macros-internal.h" #include "nmdbus-device-wifi.h" @@ -365,6 +366,10 @@ nm_device_wifi_request_scan_options (NMDeviceWifi *device, return _device_wifi_request_scan (device, options, cancellable, error); } +NM_BACKPORT_SYMBOL (libnm_1_0_6, gboolean, nm_device_wifi_request_scan_options, + (NMDeviceWifi *device, GVariant *options, GCancellable *cancellable, GError **error), + (device, options, cancellable, error)); + static void request_scan_cb (GObject *source, GAsyncResult *result, @@ -474,6 +479,10 @@ nm_device_wifi_request_scan_options_async (NMDeviceWifi *device, _device_wifi_request_scan_async (device, options, cancellable, callback, user_data); } +NM_BACKPORT_SYMBOL (libnm_1_0_6, void, nm_device_wifi_request_scan_options_async, + (NMDeviceWifi *device, GVariant *options, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), + (device, options, cancellable, callback, user_data)); + /** * nm_device_wifi_request_scan_finish: * @device: a #NMDeviceWifi |