fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 06:08:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: backport symbols for metered connections support to 1.0.6

Browse source 
Backport to 1.0.6 the following symbols:
 - nm_device_get_metered
 - nm_metered_get_type
 - nm_setting_connection_get_metered
This commit is contained in:
Beniamino Galvani 2015-07-21 19:02:12 +02:00
parent e6a8a08a57
commit 3a7c641b02
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnm-core/nm-setting-connection.c
View file

@ -783,6 +783,11 @@ nm_setting_connection_get_metered (NMSettingConnection *setting)
return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->metered; return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->metered;
} }
NM_BACKPORT_SYMBOL (libnm_1_0_6, NMMetered, nm_setting_connection_get_metered, (NMSettingConnection *setting), (setting));
NM_BACKPORT_SYMBOL (libnm_1_0_6, GType, nm_metered_get_type, (void), ());
static void static void
_set_error_missing_base_setting (GError **error, const char *type) _set_error_missing_base_setting (GError **error, const char *type)
{ {

6
libnm/libnm.ver
View file

@ -850,6 +850,12 @@ libnm_1_0_4 {
#nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4; #nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4;
} libnm_1_0_0; } libnm_1_0_0;
libnm_1_0_6 {
#nm_device_get_metered@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;
libnm_1_2_0 { libnm_1_2_0 {
global: global:
nm_access_point_get_last_seen; nm_access_point_get_last_seen;

3
libnm/nm-device.c
View file

@ -55,6 +55,7 @@
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-dbus-helpers.h" #include "nm-dbus-helpers.h"
#include "nm-setting-connection.h" #include "nm-setting-connection.h"
#include "nm-macros-internal.h"
#include "nmdbus-device.h" #include "nmdbus-device.h"
@ -1979,6 +1980,8 @@ nm_device_get_metered (NMDevice *device)
return NM_DEVICE_GET_PRIVATE (device)->metered; return NM_DEVICE_GET_PRIVATE (device)->metered;
} }
NM_BACKPORT_SYMBOL (libnm_1_0_6, NMMetered, nm_device_get_metered, (NMDevice *device), (device));
/** /**
* nm_device_is_software: * nm_device_is_software:
* @device: a #NMDevice * @device: a #NMDevice