diff options
| author | Michael Biebl <biebl@debian.org> | 2020-12-06 21:58:58 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2020-12-06 21:58:58 +0100 |
| commit | ec4fca2f78286742ae7f8313c2ee2124c1467b0c (patch) | |
| tree | b0c65baa44cb6f1146905601e26bec0385309c65 /libnm-core | |
| parent | 9c050d4b4b3b85760abead778d68a63b1fde0a02 (diff) | |
| parent | 65f86e8f56267192d42f2b629fc6b0c99fb9cd0c (diff) | |
Update upstream source from tag 'upstream/1.28.0'
Update to upstream version '1.28.0' with Debian dir 1448deb268c4818d41653eb95896b4228b7c3f72
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/meson.build | 1 | ||||
| -rw-r--r-- | libnm-core/nm-setting-ip-config.c | 2 | ||||
| -rw-r--r-- | libnm-core/tests/meson.build | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/libnm-core/meson.build b/libnm-core/meson.build index 0509deaa..da74fb04 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -82,6 +82,7 @@ libnm_core_enum_sources = gnome.mkenums_simple( enum_types, sources: libnm_core_headers + [nm_version_macro_header], identifier_prefix: nm_id_prefix, + body_prefix: '#include "nm-default.h"', install_header: true, install_dir: libnm_pkgincludedir, ) diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index e884066f..7b6624d8 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -5913,7 +5913,7 @@ nm_setting_ip_config_class_init(NMSettingIPConfigClass *klass) * to the most negative value of all active connections profiles. * * Zero selects a globally configured default value. If the latter is missing - * or zero too, it defaults to -50 for VPNs (including WireGuard) and 100 for + * or zero too, it defaults to 50 for VPNs (including WireGuard) and 100 for * other connections. * * Note that the priority is to order DNS settings for multiple active diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build index 58615e4d..4ce42526 100644 --- a/libnm-core/tests/meson.build +++ b/libnm-core/tests/meson.build @@ -15,6 +15,7 @@ enum_sources = gnome.mkenums_simple( enum_types, sources: 'test-general-enums.h', identifier_prefix: nm_id_prefix, + body_prefix: '#include "nm-default.h"', ) deps = [ |