colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm: symbols for request scanning backported to 1.0.6

Browse Source 
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
This commit is contained in:
Jiří Klimeš
2015-08-14 14:24:16 +02:00
parent 32c34a8ccd
commit acfa07a37d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libnm/libnm.ver
View File

@@ -842,6 +842,8 @@ libnm_1_0_4 {
libnm_1_0_6 { libnm_1_0_6 {
#nm_access_point_get_last_seen@libnm_1_0_6; #nm_access_point_get_last_seen@libnm_1_0_6;
#nm_device_get_metered@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_metered_get_type@libnm_1_0_6;
#nm_setting_connection_get_metered@libnm_1_0_6; #nm_setting_connection_get_metered@libnm_1_0_6;
} libnm_1_0_4; } libnm_1_0_4;

9
libnm/nm-device-wifi.c
View File

@@ -36,6 +36,7 @@
#include "nm-object-cache.h" #include "nm-object-cache.h"
#include "nm-core-internal.h" #include "nm-core-internal.h"
#include "nm-dbus-helpers.h" #include "nm-dbus-helpers.h"
#include "nm-macros-internal.h"
#include "nmdbus-device-wifi.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); 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 static void
request_scan_cb (GObject *source, request_scan_cb (GObject *source,
GAsyncResult *result, 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); _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: * nm_device_wifi_request_scan_finish:
* @device: a #NMDeviceWifi * @device: a #NMDeviceWifi