diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-26 11:44:15 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-06-26 16:28:33 +0200 |
| commit | f5cc6da8cf73eb4e3ebfac80a96733e8081e8bcf (patch) | |
| tree | ff247adf375ba87252d319111b526d11928cafe6 | |
| parent | 64ff214bb84a576c9490b73fc373e31d2c15fe53 (diff) | |
| download | NetworkManager-f5cc6da8cf73eb4e3ebfac80a96733e8081e8bcf.tar.gz | |
libnm: backport autoconnect-slaves symbols to libnm_1_0_4
https://bugzilla.gnome.org/show_bug.cgi?id=751535
| -rw-r--r-- | libnm-core/nm-setting-connection.c | 4 | ||||
| -rw-r--r-- | libnm/libnm.ver | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 3ab8873dcf..e4831aa173 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -34,6 +34,7 @@ #include "nm-setting-bridge.h" #include "nm-setting-team.h" #include "nm-setting-vlan.h" +#include "nm-macros-internal.h" /** * SECTION:nm-setting-connection @@ -625,6 +626,9 @@ nm_setting_connection_get_autoconnect_slaves (NMSettingConnection *setting) return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->autoconnect_slaves; } +NM_BACKPORT_SYMBOL (libnm_1_0_4, NMSettingConnectionAutoconnectSlaves, nm_setting_connection_get_autoconnect_slaves, (NMSettingConnection *setting), (setting)); + +NM_BACKPORT_SYMBOL (libnm_1_0_4, GType, nm_setting_connection_autoconnect_slaves_get_type, (void), ()); /** * nm_setting_connection_get_num_secondaries: diff --git a/libnm/libnm.ver b/libnm/libnm.ver index e8990c3e98..66985a2ffb 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -845,6 +845,11 @@ local: *; }; +libnm_1_0_4 { + #nm_setting_connection_autoconnect_slaves_get_type@libnm_1_0_4; + #nm_setting_connection_get_autoconnect_slaves@libnm_1_0_4; +} libnm_1_0_0; + libnm_1_2_0 { global: nm_access_point_get_last_seen; |