From 5eade4da11ee38a0e7faf4a87b2c2b5af07c5eeb Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 19 Oct 2018 19:12:53 +0200 Subject: [PATCH] libnm: add mdns backported symbols from 1.10.14 Add to master branch mdns symbols that were backported to 1.10.14 to allow seamless upgrading from 1.10 to 1.16. --- libnm/libnm.ver | 5 +++++ libnm/nm-client.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libnm/libnm.ver b/libnm/libnm.ver index 44682f5a1..cf57b1240 100644 --- a/libnm/libnm.ver +++ b/libnm/libnm.ver @@ -1332,6 +1332,11 @@ global: nm_utils_tc_tfilter_to_str; } libnm_1_10_0; +libnm_1_10_14 { + #nm_setting_connection_get_mdns@libnm_1_10_14; + #nm_setting_connection_mdns_get_type@libnm_1_10_14; +} libnm_1_10_2; + libnm_1_12_0 { global: nm_checkpoint_create_flags_get_type; diff --git a/libnm/nm-client.c b/libnm/nm-client.c index d6187536e..a669f3c5a 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -3802,3 +3802,7 @@ NM_BACKPORT_SYMBOL (libnm_1_0_6, gboolean, nm_utils_enum_from_str, (type, str, out_value, err_token)); NM_BACKPORT_SYMBOL (libnm_1_2_4, int, nm_setting_ip_config_get_dns_priority, (NMSettingIPConfig *setting), (setting)); + +NM_BACKPORT_SYMBOL (libnm_1_10_14, NMSettingConnectionMdns, nm_setting_connection_get_mdns, + (NMSettingConnection *setting), (setting)); +NM_BACKPORT_SYMBOL (libnm_1_10_14, GType, nm_setting_connection_mdns_get_type, (void), ());