From 3a7c641b022bc919a75e27bb60ccc9bceaf0deff Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 21 Jul 2015 19:02:12 +0200
Subject: [PATCH] libnm: backport symbols for metered connections support to
 1.0.6

Backport to 1.0.6 the following symbols:
 - nm_device_get_metered
 - nm_metered_get_type
 - nm_setting_connection_get_metered
---
 libnm-core/nm-setting-connection.c | 5 +++++
 libnm/libnm.ver                    | 6 ++++++
 libnm/nm-device.c                  | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index 5945f9c246..21b9d80ed5 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -783,6 +783,11 @@ nm_setting_connection_get_metered (NMSettingConnection *setting)
 	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
 _set_error_missing_base_setting (GError **error, const char *type)
 {
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 66985a2ffb..01e01c910a 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -850,6 +850,12 @@ libnm_1_0_4 {
 	#nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4;
 } 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 {
 global:
 	nm_access_point_get_last_seen;
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 9781095dbe..19268a4306 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -55,6 +55,7 @@
 #include "nm-utils.h"
 #include "nm-dbus-helpers.h"
 #include "nm-setting-connection.h"
+#include "nm-macros-internal.h"
 
 #include "nmdbus-device.h"
 
@@ -1979,6 +1980,8 @@ nm_device_get_metered (NMDevice *device)
 	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:
  * @device: a #NMDevice