New upstream version 1.34.0 upstream/1.34.0

66 files changed, 279 insertions, 191 deletions

diff --git a/src/libnm-core-public/meson.build b/src/libnm-core-public/meson.build
index 6b8dad0f..f1da4d02 100644
--- a/src/libnm-core-public/meson.build
+++ b/src/libnm-core-public/meson.build
@@ -13,6 +13,7 @@ libnm_core_headers = files(
   'nm-setting-adsl.h',
   'nm-setting-bluetooth.h',
   'nm-setting-bond.h',
+  'nm-setting-bond-port.h',
   'nm-setting-bridge-port.h',
   'nm-setting-bridge.h',
   'nm-setting-cdma.h',
diff --git a/src/libnm-core-public/nm-connection.h b/src/libnm-core-public/nm-connection.h
index 44d1568d..fb54ce88 100644
--- a/src/libnm-core-public/nm-connection.h
+++ b/src/libnm-core-public/nm-connection.h
@@ -8,7 +8,7 @@
 #define __NM_CONNECTION_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-core-types.h"
@@ -29,9 +29,20 @@ G_BEGIN_DECLS
 #define NM_CONNECTION_CHANGED         "changed"
 
 /*
+ * NM_CONNECTION_NORMALIZE_PARAM_IP4_CONFIG_METHOD: overwrite the ip4 method
+ * when normalizing ip4 configuration. This only takes effect, if the profile
+ * has no IPv4 settings and new settings are to be added. If omitted, this
+ * defaults depends on the profile type but usually it is "auto".
+ *
+ * Since: 1.34
+ */
+#define NM_CONNECTION_NORMALIZE_PARAM_IP4_CONFIG_METHOD "ip4-config-method"
+
+/*
  * NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD: overwrite the ip6 method
- * when normalizing ip6 configuration. If omitted, this defaults to
- * @NM_SETTING_IP6_CONFIG_METHOD_AUTO.
+ * when normalizing ip6 configuration. This only takes effect, if the profile
+ * has no IPv6 settings and new settings are to be added. If omitted, this
+ * defaults depends on the profile type but usually it is "auto".
  */
 #define NM_CONNECTION_NORMALIZE_PARAM_IP6_CONFIG_METHOD "ip6-config-method"
 
diff --git a/src/libnm-core-public/nm-core-types.h b/src/libnm-core-public/nm-core-types.h
index bf0c2a99..c86c28fa 100644
--- a/src/libnm-core-public/nm-core-types.h
+++ b/src/libnm-core-public/nm-core-types.h
@@ -19,6 +19,7 @@ typedef struct _NMSetting8021x            NMSetting8021x;
 typedef struct _NMSettingAdsl             NMSettingAdsl;
 typedef struct _NMSettingBluetooth        NMSettingBluetooth;
 typedef struct _NMSettingBond             NMSettingBond;
+typedef struct _NMSettingBondPort         NMSettingBondPort;
 typedef struct _NMSettingBridge           NMSettingBridge;
 typedef struct _NMSettingBridgePort       NMSettingBridgePort;
 typedef struct _NMSettingCdma             NMSettingCdma;
diff --git a/src/libnm-core-public/nm-dbus-interface.h b/src/libnm-core-public/nm-dbus-interface.h
index 626b2006..7fd228ca 100644
--- a/src/libnm-core-public/nm-dbus-interface.h
+++ b/src/libnm-core-public/nm-dbus-interface.h
@@ -15,8 +15,8 @@
 /* This header must not include glib or libnm. */
 
 #ifndef NM_VERSION_H
-    #define NM_AVAILABLE_IN_1_2
-    #define NM_AVAILABLE_IN_1_8
+#define NM_AVAILABLE_IN_1_2
+#define NM_AVAILABLE_IN_1_8
 #endif
 
 /*
@@ -860,8 +860,8 @@ typedef enum /*< flags >*/ {
 } NMSecretAgentCapabilities;
 
 #ifndef NM_VERSION_H
-    #undef NM_AVAILABLE_IN_1_2
-    #undef NM_AVAILABLE_IN_1_8
+#undef NM_AVAILABLE_IN_1_2
+#undef NM_AVAILABLE_IN_1_8
 #endif
 
 #define NM_LLDP_ATTR_RAW                  "raw"
diff --git a/src/libnm-core-public/nm-keyfile.h b/src/libnm-core-public/nm-keyfile.h
index 28c052f9..e298aae8 100644
--- a/src/libnm-core-public/nm-keyfile.h
+++ b/src/libnm-core-public/nm-keyfile.h
@@ -4,7 +4,7 @@
 #define __NM_KEYFILE_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-core-types.h"
diff --git a/src/libnm-core-public/nm-setting-6lowpan.h b/src/libnm-core-public/nm-setting-6lowpan.h
index 5a7c3986..358ccff6 100644
--- a/src/libnm-core-public/nm-setting-6lowpan.h
+++ b/src/libnm-core-public/nm-setting-6lowpan.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_6LOWPAN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-8021x.h b/src/libnm-core-public/nm-setting-8021x.h
index 98e26d12..f9ebdd1c 100644
--- a/src/libnm-core-public/nm-setting-8021x.h
+++ b/src/libnm-core-public/nm-setting-8021x.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_8021X_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-adsl.h b/src/libnm-core-public/nm-setting-adsl.h
index c655d74c..8c584fed 100644
--- a/src/libnm-core-public/nm-setting-adsl.h
+++ b/src/libnm-core-public/nm-setting-adsl.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_ADSL_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-bluetooth.h b/src/libnm-core-public/nm-setting-bluetooth.h
index 69f921ee..6388430a 100644
--- a/src/libnm-core-public/nm-setting-bluetooth.h
+++ b/src/libnm-core-public/nm-setting-bluetooth.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_BLUETOOTH_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-bond-port.h b/src/libnm-core-public/nm-setting-bond-port.h
new file mode 100644
index 00000000..0b20e4a8
--- /dev/null
+++ b/src/libnm-core-public/nm-setting-bond-port.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2012 Red Hat, Inc.
+ */
+
+#ifndef __NM_SETTING_BOND_PORT_H__
+#define __NM_SETTING_BOND_PORT_H__
+
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+#error "Only <NetworkManager.h> can be included directly."
+#endif
+
+#include "nm-setting.h"
+#include "nm-setting-bond.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_SETTING_BOND_PORT (nm_setting_bond_port_get_type())
+#define NM_SETTING_BOND_PORT(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPort))
+#define NM_SETTING_BOND_PORT_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPortClass))
+#define NM_IS_SETTING_BOND_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_BOND_PORT))
+#define NM_IS_SETTING_BOND_PORT_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_BOND_PORT))
+#define NM_SETTING_BOND_PORT_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_BOND_PORT, NMSettingBondPortClass))
+
+#define NM_SETTING_BOND_PORT_SETTING_NAME "bond-port"
+
+#define NM_SETTING_BOND_PORT_QUEUE_ID "queue-id"
+
+typedef struct _NMSettingBondPortClass NMSettingBondPortClass;
+
+NM_AVAILABLE_IN_1_34
+GType nm_setting_bond_port_get_type(void);
+
+NM_AVAILABLE_IN_1_34
+NMSetting *nm_setting_bond_port_new(void);
+
+NM_AVAILABLE_IN_1_34
+guint32 nm_setting_bond_port_get_queue_id(NMSettingBondPort *setting);
+
+G_END_DECLS
+
+#endif /* __NM_SETTING_BOND_PORT_H__ */
diff --git a/src/libnm-core-public/nm-setting-bond.h b/src/libnm-core-public/nm-setting-bond.h
index c869e4c8..e819b4e1 100644
--- a/src/libnm-core-public/nm-setting-bond.h
+++ b/src/libnm-core-public/nm-setting-bond.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_BOND_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-bridge-port.h b/src/libnm-core-public/nm-setting-bridge-port.h
index 8e5c2b4a..61da5ba5 100644
--- a/src/libnm-core-public/nm-setting-bridge-port.h
+++ b/src/libnm-core-public/nm-setting-bridge-port.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_BRIDGE_PORT_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-bridge.h b/src/libnm-core-public/nm-setting-bridge.h
index cda18612..3a129811 100644
--- a/src/libnm-core-public/nm-setting-bridge.h
+++ b/src/libnm-core-public/nm-setting-bridge.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_BRIDGE_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-cdma.h b/src/libnm-core-public/nm-setting-cdma.h
index 9b72a839..1378f170 100644
--- a/src/libnm-core-public/nm-setting-cdma.h
+++ b/src/libnm-core-public/nm-setting-cdma.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_CDMA_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-connection.h b/src/libnm-core-public/nm-setting-connection.h
index 3b4da44a..54fc7929 100644
--- a/src/libnm-core-public/nm-setting-connection.h
+++ b/src/libnm-core-public/nm-setting-connection.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_CONNECTION_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
@@ -56,6 +56,7 @@ G_BEGIN_DECLS
 #define NM_SETTING_CONNECTION_AUTH_RETRIES         "auth-retries"
 #define NM_SETTING_CONNECTION_MDNS                 "mdns"
 #define NM_SETTING_CONNECTION_LLMNR                "llmnr"
+#define NM_SETTING_CONNECTION_DNS_OVER_TLS         "dns-over-tls"
 #define NM_SETTING_CONNECTION_WAIT_DEVICE_TIMEOUT  "wait-device-timeout"
 #define NM_SETTING_CONNECTION_MUD_URL              "mud-url"
 
@@ -127,6 +128,24 @@ typedef enum {
     NM_SETTING_CONNECTION_LLMNR_YES     = 2,
 } NMSettingConnectionLlmnr;
 
+/**
+ * NMSettingConnectionDnsOverTls:
+ * @NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT: default value
+ * @NM_SETTING_CONNECTION_DNS_OVER_TLS_NO: disable DNSOverTls
+ * @NM_SETTING_CONNECTION_DNS_OVER_TLS_OPPORTUNISTIC: enable opportunistic mode
+ * @NM_SETTING_CONNECTION_DNS_OVER_TLS_YES: enable strict mode
+ *
+ * #NMSettingConnectionDnsOverTls values indicate whether DNSOverTls should be enabled.
+ *
+ * Since: 1.34
+ */
+typedef enum {
+    NM_SETTING_CONNECTION_DNS_OVER_TLS_DEFAULT       = -1,
+    NM_SETTING_CONNECTION_DNS_OVER_TLS_NO            = 0,
+    NM_SETTING_CONNECTION_DNS_OVER_TLS_OPPORTUNISTIC = 1,
+    NM_SETTING_CONNECTION_DNS_OVER_TLS_YES           = 2,
+} NMSettingConnectionDnsOverTls;
+
 typedef struct _NMSettingConnectionClass NMSettingConnectionClass;
 
 GType nm_setting_connection_get_type(void);
@@ -193,6 +212,8 @@ NM_AVAILABLE_IN_1_12
 NMSettingConnectionMdns nm_setting_connection_get_mdns(NMSettingConnection *setting);
 NM_AVAILABLE_IN_1_14
 NMSettingConnectionLlmnr nm_setting_connection_get_llmnr(NMSettingConnection *setting);
+NM_AVAILABLE_IN_1_34
+NMSettingConnectionDnsOverTls nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting);
 
 NM_AVAILABLE_IN_1_20
 gint32 nm_setting_connection_get_wait_device_timeout(NMSettingConnection *setting);
diff --git a/src/libnm-core-public/nm-setting-dcb.h b/src/libnm-core-public/nm-setting-dcb.h
index b342c465..53786213 100644
--- a/src/libnm-core-public/nm-setting-dcb.h
+++ b/src/libnm-core-public/nm-setting-dcb.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_DCB_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-dummy.h b/src/libnm-core-public/nm-setting-dummy.h
index 2231ea17..85e8a260 100644
--- a/src/libnm-core-public/nm-setting-dummy.h
+++ b/src/libnm-core-public/nm-setting-dummy.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_DUMMY_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ethtool.h b/src/libnm-core-public/nm-setting-ethtool.h
index eab447af..698dcebe 100644
--- a/src/libnm-core-public/nm-setting-ethtool.h
+++ b/src/libnm-core-public/nm-setting-ethtool.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_ETHTOOL_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-generic.h b/src/libnm-core-public/nm-setting-generic.h
index b5346abb..9bdcd11d 100644
--- a/src/libnm-core-public/nm-setting-generic.h
+++ b/src/libnm-core-public/nm-setting-generic.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_GENERIC_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-gsm.h b/src/libnm-core-public/nm-setting-gsm.h
index 59703c3c..0d57511d 100644
--- a/src/libnm-core-public/nm-setting-gsm.h
+++ b/src/libnm-core-public/nm-setting-gsm.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_GSM_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-hostname.h b/src/libnm-core-public/nm-setting-hostname.h
index 02b4e373..f93e0efe 100644
--- a/src/libnm-core-public/nm-setting-hostname.h
+++ b/src/libnm-core-public/nm-setting-hostname.h
@@ -7,7 +7,7 @@
 #define NM_SETTING_HOSTNAME_H
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-infiniband.h b/src/libnm-core-public/nm-setting-infiniband.h
index 3d422133..44f30839 100644
--- a/src/libnm-core-public/nm-setting-infiniband.h
+++ b/src/libnm-core-public/nm-setting-infiniband.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_INFINIBAND_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ip-config.h b/src/libnm-core-public/nm-setting-ip-config.h
index 9a745cb2..126c4c11 100644
--- a/src/libnm-core-public/nm-setting-ip-config.h
+++ b/src/libnm-core-public/nm-setting-ip-config.h
@@ -8,7 +8,7 @@
 #define NM_SETTING_IP_CONFIG_H
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
@@ -248,11 +248,11 @@ NM_AVAILABLE_IN_1_20
 void nm_ip_routing_rule_set_suppress_prefixlength(NMIPRoutingRule *self,
                                                   gint32           suppress_prefixlength);
 
-NM_AVAILABLE_IN_1_32
+NM_AVAILABLE_IN_1_34
 gboolean nm_ip_routing_rule_get_uid_range(const NMIPRoutingRule *self,
                                           guint32 *              out_range_start,
                                           guint32 *              out_range_end);
-NM_AVAILABLE_IN_1_32
+NM_AVAILABLE_IN_1_34
 void nm_ip_routing_rule_set_uid_range(NMIPRoutingRule *self,
                                       guint32          uid_range_start,
                                       guint32          uid_range_end);
@@ -474,7 +474,7 @@ NM_AVAILABLE_IN_1_2
 int nm_setting_ip_config_get_dad_timeout(NMSettingIPConfig *setting);
 NM_AVAILABLE_IN_1_2
 int nm_setting_ip_config_get_dhcp_timeout(NMSettingIPConfig *setting);
-NM_AVAILABLE_IN_1_32_4
+NM_AVAILABLE_IN_1_34
 int nm_setting_ip_config_get_required_timeout(NMSettingIPConfig *setting);
 NM_AVAILABLE_IN_1_22
 const char *nm_setting_ip_config_get_dhcp_iaid(NMSettingIPConfig *setting);
diff --git a/src/libnm-core-public/nm-setting-ip-tunnel.h b/src/libnm-core-public/nm-setting-ip-tunnel.h
index 0a83b0a2..4710411c 100644
--- a/src/libnm-core-public/nm-setting-ip-tunnel.h
+++ b/src/libnm-core-public/nm-setting-ip-tunnel.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_IP_TUNNEL_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ip4-config.h b/src/libnm-core-public/nm-setting-ip4-config.h
index ce917b11..d0bd836d 100644
--- a/src/libnm-core-public/nm-setting-ip4-config.h
+++ b/src/libnm-core-public/nm-setting-ip4-config.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_IP4_CONFIG_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting-ip-config.h"
diff --git a/src/libnm-core-public/nm-setting-ip6-config.h b/src/libnm-core-public/nm-setting-ip6-config.h
index 5e5d459d..c51a7438 100644
--- a/src/libnm-core-public/nm-setting-ip6-config.h
+++ b/src/libnm-core-public/nm-setting-ip6-config.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_IP6_CONFIG_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting-ip-config.h"
diff --git a/src/libnm-core-public/nm-setting-macsec.h b/src/libnm-core-public/nm-setting-macsec.h
index 67801a64..52e4313d 100644
--- a/src/libnm-core-public/nm-setting-macsec.h
+++ b/src/libnm-core-public/nm-setting-macsec.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_MACSEC_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-macvlan.h b/src/libnm-core-public/nm-setting-macvlan.h
index 82a5b20d..88ee81e7 100644
--- a/src/libnm-core-public/nm-setting-macvlan.h
+++ b/src/libnm-core-public/nm-setting-macvlan.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_MACVLAN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-match.h b/src/libnm-core-public/nm-setting-match.h
index 40d12b65..a4e283e2 100644
--- a/src/libnm-core-public/nm-setting-match.h
+++ b/src/libnm-core-public/nm-setting-match.h
@@ -7,7 +7,7 @@
 #define NM_SETTING_MATCH_H
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-olpc-mesh.h b/src/libnm-core-public/nm-setting-olpc-mesh.h
index f692d9a3..c9903f75 100644
--- a/src/libnm-core-public/nm-setting-olpc-mesh.h
+++ b/src/libnm-core-public/nm-setting-olpc-mesh.h
@@ -9,7 +9,7 @@
 #define __NM_SETTING_OLPC_MESH_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-bridge.h b/src/libnm-core-public/nm-setting-ovs-bridge.h
index b3078715..33e8dffb 100644
--- a/src/libnm-core-public/nm-setting-ovs-bridge.h
+++ b/src/libnm-core-public/nm-setting-ovs-bridge.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_BRIDGE_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-dpdk.h b/src/libnm-core-public/nm-setting-ovs-dpdk.h
index 72de2243..5d96aef4 100644
--- a/src/libnm-core-public/nm-setting-ovs-dpdk.h
+++ b/src/libnm-core-public/nm-setting-ovs-dpdk.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_DPDK_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-external-ids.h b/src/libnm-core-public/nm-setting-ovs-external-ids.h
index 906db392..3ae991a1 100644
--- a/src/libnm-core-public/nm-setting-ovs-external-ids.h
+++ b/src/libnm-core-public/nm-setting-ovs-external-ids.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_EXTERNAL_IDS_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-interface.h b/src/libnm-core-public/nm-setting-ovs-interface.h
index 47ad5817..a36a1a53 100644
--- a/src/libnm-core-public/nm-setting-ovs-interface.h
+++ b/src/libnm-core-public/nm-setting-ovs-interface.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_INTERFACE_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-patch.h b/src/libnm-core-public/nm-setting-ovs-patch.h
index fd80d45a..1d5f4843 100644
--- a/src/libnm-core-public/nm-setting-ovs-patch.h
+++ b/src/libnm-core-public/nm-setting-ovs-patch.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_PATCH_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ovs-port.h b/src/libnm-core-public/nm-setting-ovs-port.h
index 06d3a2aa..eda23d3e 100644
--- a/src/libnm-core-public/nm-setting-ovs-port.h
+++ b/src/libnm-core-public/nm-setting-ovs-port.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_OVS_PORT_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-ppp.h b/src/libnm-core-public/nm-setting-ppp.h
index 2c85f3fd..d9f93a5b 100644
--- a/src/libnm-core-public/nm-setting-ppp.h
+++ b/src/libnm-core-public/nm-setting-ppp.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_PPP_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-pppoe.h b/src/libnm-core-public/nm-setting-pppoe.h
index b9eb34bb..5abf9c9f 100644
--- a/src/libnm-core-public/nm-setting-pppoe.h
+++ b/src/libnm-core-public/nm-setting-pppoe.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_PPPOE_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-proxy.h b/src/libnm-core-public/nm-setting-proxy.h
index a10786ab..f2863916 100644
--- a/src/libnm-core-public/nm-setting-proxy.h
+++ b/src/libnm-core-public/nm-setting-proxy.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_PROXY_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-serial.h b/src/libnm-core-public/nm-setting-serial.h
index b3b0421a..4f8ead82 100644
--- a/src/libnm-core-public/nm-setting-serial.h
+++ b/src/libnm-core-public/nm-setting-serial.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_SERIAL_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-sriov.h b/src/libnm-core-public/nm-setting-sriov.h
index fe5fc376..93afde98 100644
--- a/src/libnm-core-public/nm-setting-sriov.h
+++ b/src/libnm-core-public/nm-setting-sriov.h
@@ -7,7 +7,7 @@
 #define NM_SETTING_SRIOV_H
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-tc-config.h b/src/libnm-core-public/nm-setting-tc-config.h
index a2bc9a0d..7e8a44b5 100644
--- a/src/libnm-core-public/nm-setting-tc-config.h
+++ b/src/libnm-core-public/nm-setting-tc-config.h
@@ -7,7 +7,7 @@
 #define NM_SETTING_TC_CONFIG_H
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-team-port.h b/src/libnm-core-public/nm-setting-team-port.h
index 7acd9bf2..3e472257 100644
--- a/src/libnm-core-public/nm-setting-team-port.h
+++ b/src/libnm-core-public/nm-setting-team-port.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_TEAM_PORT_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-team.h b/src/libnm-core-public/nm-setting-team.h
index 5ed7ac36..82174152 100644
--- a/src/libnm-core-public/nm-setting-team.h
+++ b/src/libnm-core-public/nm-setting-team.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_TEAM_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-tun.h b/src/libnm-core-public/nm-setting-tun.h
index b7376995..8f808410 100644
--- a/src/libnm-core-public/nm-setting-tun.h
+++ b/src/libnm-core-public/nm-setting-tun.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_TUN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-user.h b/src/libnm-core-public/nm-setting-user.h
index b151cd3e..7f44afae 100644
--- a/src/libnm-core-public/nm-setting-user.h
+++ b/src/libnm-core-public/nm-setting-user.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_USER_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-veth.h b/src/libnm-core-public/nm-setting-veth.h
index 5dbc1927..2609a2c6 100644
--- a/src/libnm-core-public/nm-setting-veth.h
+++ b/src/libnm-core-public/nm-setting-veth.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_VETH_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-vlan.h b/src/libnm-core-public/nm-setting-vlan.h
index 1d2470b6..09a407db 100644
--- a/src/libnm-core-public/nm-setting-vlan.h
+++ b/src/libnm-core-public/nm-setting-vlan.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_VLAN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-vpn.h b/src/libnm-core-public/nm-setting-vpn.h
index 3a74d0b1..9fbb791b 100644
--- a/src/libnm-core-public/nm-setting-vpn.h
+++ b/src/libnm-core-public/nm-setting-vpn.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_VPN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-vrf.h b/src/libnm-core-public/nm-setting-vrf.h
index afa044b8..01194863 100644
--- a/src/libnm-core-public/nm-setting-vrf.h
+++ b/src/libnm-core-public/nm-setting-vrf.h
@@ -4,7 +4,7 @@
 #define __NM_SETTING_VRF_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-vxlan.h b/src/libnm-core-public/nm-setting-vxlan.h
index 6531f1d2..0cf84eaf 100644
--- a/src/libnm-core-public/nm-setting-vxlan.h
+++ b/src/libnm-core-public/nm-setting-vxlan.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_VXLAN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wifi-p2p.h b/src/libnm-core-public/nm-setting-wifi-p2p.h
index 029b75f0..50cafad4 100644
--- a/src/libnm-core-public/nm-setting-wifi-p2p.h
+++ b/src/libnm-core-public/nm-setting-wifi-p2p.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_WIFI_P2P_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wimax.h b/src/libnm-core-public/nm-setting-wimax.h
index 12125fb2..88c8588f 100644
--- a/src/libnm-core-public/nm-setting-wimax.h
+++ b/src/libnm-core-public/nm-setting-wimax.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_WIMAX_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wired.h b/src/libnm-core-public/nm-setting-wired.h
index 33308604..54c8f9c0 100644
--- a/src/libnm-core-public/nm-setting-wired.h
+++ b/src/libnm-core-public/nm-setting-wired.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_WIRED_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wireguard.h b/src/libnm-core-public/nm-setting-wireguard.h
index 3f046fc7..cb475d27 100644
--- a/src/libnm-core-public/nm-setting-wireguard.h
+++ b/src/libnm-core-public/nm-setting-wireguard.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_WIREGUARD_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wireless-security.h b/src/libnm-core-public/nm-setting-wireless-security.h
index cf662a37..9686e7d5 100644
--- a/src/libnm-core-public/nm-setting-wireless-security.h
+++ b/src/libnm-core-public/nm-setting-wireless-security.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_WIRELESS_SECURITY_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wireless.h b/src/libnm-core-public/nm-setting-wireless.h
index 0b45e2a3..4451785f 100644
--- a/src/libnm-core-public/nm-setting-wireless.h
+++ b/src/libnm-core-public/nm-setting-wireless.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_WIRELESS_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting-wpan.h b/src/libnm-core-public/nm-setting-wpan.h
index 2a09d49b..883b77e1 100644
--- a/src/libnm-core-public/nm-setting-wpan.h
+++ b/src/libnm-core-public/nm-setting-wpan.h
@@ -7,7 +7,7 @@
 #define __NM_SETTING_WPAN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
diff --git a/src/libnm-core-public/nm-setting.h b/src/libnm-core-public/nm-setting.h
index 6206a774..ea2525dc 100644
--- a/src/libnm-core-public/nm-setting.h
+++ b/src/libnm-core-public/nm-setting.h
@@ -8,7 +8,7 @@
 #define __NM_SETTING_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-core-types.h"
diff --git a/src/libnm-core-public/nm-simple-connection.h b/src/libnm-core-public/nm-simple-connection.h
index 6586c922..cc20bd16 100644
--- a/src/libnm-core-public/nm-simple-connection.h
+++ b/src/libnm-core-public/nm-simple-connection.h
@@ -7,7 +7,7 @@
 #define __NM_SIMPLE_CONNECTION_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-connection.h"
diff --git a/src/libnm-core-public/nm-utils.h b/src/libnm-core-public/nm-utils.h
index 0f8dcda0..5100b678 100644
--- a/src/libnm-core-public/nm-utils.h
+++ b/src/libnm-core-public/nm-utils.h
@@ -7,7 +7,7 @@
 #define __NM_UTILS_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include <glib.h>
diff --git a/src/libnm-core-public/nm-version-macros.h b/src/libnm-core-public/nm-version-macros.h
index c3899eab..3063f2f4 100644
--- a/src/libnm-core-public/nm-version-macros.h
+++ b/src/libnm-core-public/nm-version-macros.h
@@ -22,7 +22,7 @@
  * Evaluates to the minor version number of NetworkManager which this source
  * is compiled against.
  */
-#define NM_MINOR_VERSION (32)
+#define NM_MINOR_VERSION (34)
 
 /**
  * NM_MICRO_VERSION:
@@ -30,7 +30,7 @@
  * Evaluates to the micro version number of NetworkManager which this source
  * compiled against.
  */
-#define NM_MICRO_VERSION (12)
+#define NM_MICRO_VERSION (0)
 
 /**
  * NM_CHECK_VERSION:
@@ -68,7 +68,7 @@
 #define NM_VERSION_1_28   (NM_ENCODE_VERSION (1, 28, 0))
 #define NM_VERSION_1_30   (NM_ENCODE_VERSION (1, 30, 0))
 #define NM_VERSION_1_32   (NM_ENCODE_VERSION (1, 32, 0))
-#define NM_VERSION_1_32_4 (NM_ENCODE_VERSION (1, 32, 4))
+#define NM_VERSION_1_34   (NM_ENCODE_VERSION (1, 34, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/libnm-core-public/nm-version-macros.h.in b/src/libnm-core-public/nm-version-macros.h.in
index 35e89287..8ec83436 100644
--- a/src/libnm-core-public/nm-version-macros.h.in
+++ b/src/libnm-core-public/nm-version-macros.h.in
@@ -68,7 +68,7 @@
 #define NM_VERSION_1_28   (NM_ENCODE_VERSION (1, 28, 0))
 #define NM_VERSION_1_30   (NM_ENCODE_VERSION (1, 30, 0))
 #define NM_VERSION_1_32   (NM_ENCODE_VERSION (1, 32, 0))
-#define NM_VERSION_1_32_4 (NM_ENCODE_VERSION (1, 32, 4))
+#define NM_VERSION_1_34   (NM_ENCODE_VERSION (1, 34, 0))
 
 /* For releases, NM_API_VERSION is equal to NM_VERSION.
  *
diff --git a/src/libnm-core-public/nm-version.h b/src/libnm-core-public/nm-version.h
index 10ceb581..f0f09fa8 100644
--- a/src/libnm-core-public/nm-version.h
+++ b/src/libnm-core-public/nm-version.h
@@ -13,282 +13,290 @@
 /* Deprecation / Availability macros */
 
 #if !defined(NM_VERSION_MIN_REQUIRED) || (NM_VERSION_MIN_REQUIRED == 0)
-    #undef NM_VERSION_MIN_REQUIRED
-    #define NM_VERSION_MIN_REQUIRED (NM_API_VERSION)
+#undef NM_VERSION_MIN_REQUIRED
+#define NM_VERSION_MIN_REQUIRED (NM_API_VERSION)
 #endif
 
 #if !defined(NM_VERSION_MAX_ALLOWED) || (NM_VERSION_MAX_ALLOWED == 0)
-    #undef NM_VERSION_MAX_ALLOWED
-    #define NM_VERSION_MAX_ALLOWED (NM_API_VERSION)
+#undef NM_VERSION_MAX_ALLOWED
+#define NM_VERSION_MAX_ALLOWED (NM_API_VERSION)
 #endif
 
 /* sanity checks */
 #if NM_VERSION_MIN_REQUIRED > NM_API_VERSION
-    #error "NM_VERSION_MIN_REQUIRED must be <= NM_API_VERSION"
+#error "NM_VERSION_MIN_REQUIRED must be <= NM_API_VERSION"
 #endif
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_MIN_REQUIRED
-    #error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED"
+#error "NM_VERSION_MAX_ALLOWED must be >= NM_VERSION_MIN_REQUIRED"
 #endif
 #if NM_VERSION_MIN_REQUIRED < NM_VERSION_0_9_8
-    #error "NM_VERSION_MIN_REQUIRED must be >= NM_VERSION_0_9_8"
+#error "NM_VERSION_MIN_REQUIRED must be >= NM_VERSION_0_9_8"
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_0_9_10
-    #define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
-    #define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_0_9_10        G_DEPRECATED
+#define NM_DEPRECATED_IN_0_9_10_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_0_9_10
-    #define NM_DEPRECATED_IN_0_9_10_FOR(f)
+#define NM_DEPRECATED_IN_0_9_10
+#define NM_DEPRECATED_IN_0_9_10_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_0_9_10
-    #define NM_AVAILABLE_IN_0_9_10 G_UNAVAILABLE(0.9, 10)
+#define NM_AVAILABLE_IN_0_9_10 G_UNAVAILABLE(0.9, 10)
 #else
-    #define NM_AVAILABLE_IN_0_9_10
+#define NM_AVAILABLE_IN_0_9_10
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_0
-    #define NM_DEPRECATED_IN_1_0        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_0_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_0        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_0_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_0
-    #define NM_DEPRECATED_IN_1_0_FOR(f)
+#define NM_DEPRECATED_IN_1_0
+#define NM_DEPRECATED_IN_1_0_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_0
-    #define NM_AVAILABLE_IN_1_0 G_UNAVAILABLE(1, 0)
+#define NM_AVAILABLE_IN_1_0 G_UNAVAILABLE(1, 0)
 #else
-    #define NM_AVAILABLE_IN_1_0
+#define NM_AVAILABLE_IN_1_0
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_2
-    #define NM_DEPRECATED_IN_1_2        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_2_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_2        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_2_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_2
-    #define NM_DEPRECATED_IN_1_2_FOR(f)
+#define NM_DEPRECATED_IN_1_2
+#define NM_DEPRECATED_IN_1_2_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_2
-    #define NM_AVAILABLE_IN_1_2 G_UNAVAILABLE(1, 2)
+#define NM_AVAILABLE_IN_1_2 G_UNAVAILABLE(1, 2)
 #else
-    #define NM_AVAILABLE_IN_1_2
+#define NM_AVAILABLE_IN_1_2
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_4
-    #define NM_DEPRECATED_IN_1_4        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_4        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_4_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_4
-    #define NM_DEPRECATED_IN_1_4_FOR(f)
+#define NM_DEPRECATED_IN_1_4
+#define NM_DEPRECATED_IN_1_4_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_4
-    #define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1, 4)
+#define NM_AVAILABLE_IN_1_4 G_UNAVAILABLE(1, 4)
 #else
-    #define NM_AVAILABLE_IN_1_4
+#define NM_AVAILABLE_IN_1_4
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_6
-    #define NM_DEPRECATED_IN_1_6        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_6        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_6_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_6
-    #define NM_DEPRECATED_IN_1_6_FOR(f)
+#define NM_DEPRECATED_IN_1_6
+#define NM_DEPRECATED_IN_1_6_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_6
-    #define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1, 6)
+#define NM_AVAILABLE_IN_1_6 G_UNAVAILABLE(1, 6)
 #else
-    #define NM_AVAILABLE_IN_1_6
+#define NM_AVAILABLE_IN_1_6
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_8
-    #define NM_DEPRECATED_IN_1_8        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_8_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_8        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_8_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_8
-    #define NM_DEPRECATED_IN_1_8_FOR(f)
+#define NM_DEPRECATED_IN_1_8
+#define NM_DEPRECATED_IN_1_8_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_8
-    #define NM_AVAILABLE_IN_1_8 G_UNAVAILABLE(1, 8)
+#define NM_AVAILABLE_IN_1_8 G_UNAVAILABLE(1, 8)
 #else
-    #define NM_AVAILABLE_IN_1_8
+#define NM_AVAILABLE_IN_1_8
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_10
-    #define NM_DEPRECATED_IN_1_10        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_10_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_10        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_10_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_10
-    #define NM_DEPRECATED_IN_1_10_FOR(f)
+#define NM_DEPRECATED_IN_1_10
+#define NM_DEPRECATED_IN_1_10_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_10
-    #define NM_AVAILABLE_IN_1_10 G_UNAVAILABLE(1, 10)
+#define NM_AVAILABLE_IN_1_10 G_UNAVAILABLE(1, 10)
 #else
-    #define NM_AVAILABLE_IN_1_10
+#define NM_AVAILABLE_IN_1_10
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_12
-    #define NM_DEPRECATED_IN_1_12        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_12_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_12        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_12_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_12
-    #define NM_DEPRECATED_IN_1_12_FOR(f)
+#define NM_DEPRECATED_IN_1_12
+#define NM_DEPRECATED_IN_1_12_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_12
-    #define NM_AVAILABLE_IN_1_12 G_UNAVAILABLE(1, 12)
+#define NM_AVAILABLE_IN_1_12 G_UNAVAILABLE(1, 12)
 #else
-    #define NM_AVAILABLE_IN_1_12
+#define NM_AVAILABLE_IN_1_12
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_14
-    #define NM_DEPRECATED_IN_1_14        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_14_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_14        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_14_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_14
-    #define NM_DEPRECATED_IN_1_14_FOR(f)
+#define NM_DEPRECATED_IN_1_14
+#define NM_DEPRECATED_IN_1_14_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_14
-    #define NM_AVAILABLE_IN_1_14 G_UNAVAILABLE(1, 14)
+#define NM_AVAILABLE_IN_1_14 G_UNAVAILABLE(1, 14)
 #else
-    #define NM_AVAILABLE_IN_1_14
+#define NM_AVAILABLE_IN_1_14
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_16
-    #define NM_DEPRECATED_IN_1_16        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_16_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_16        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_16_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_16
-    #define NM_DEPRECATED_IN_1_16_FOR(f)
+#define NM_DEPRECATED_IN_1_16
+#define NM_DEPRECATED_IN_1_16_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_16
-    #define NM_AVAILABLE_IN_1_16 G_UNAVAILABLE(1, 16)
+#define NM_AVAILABLE_IN_1_16 G_UNAVAILABLE(1, 16)
 #else
-    #define NM_AVAILABLE_IN_1_16
+#define NM_AVAILABLE_IN_1_16
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_18
-    #define NM_DEPRECATED_IN_1_18        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_18_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_18        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_18_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_18
-    #define NM_DEPRECATED_IN_1_18_FOR(f)
+#define NM_DEPRECATED_IN_1_18
+#define NM_DEPRECATED_IN_1_18_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_18
-    #define NM_AVAILABLE_IN_1_18 G_UNAVAILABLE(1, 18)
+#define NM_AVAILABLE_IN_1_18 G_UNAVAILABLE(1, 18)
 #else
-    #define NM_AVAILABLE_IN_1_18
+#define NM_AVAILABLE_IN_1_18
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_20
-    #define NM_DEPRECATED_IN_1_20        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_20_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_20        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_20_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_20
-    #define NM_DEPRECATED_IN_1_20_FOR(f)
+#define NM_DEPRECATED_IN_1_20
+#define NM_DEPRECATED_IN_1_20_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_20
-    #define NM_AVAILABLE_IN_1_20 G_UNAVAILABLE(1, 20)
+#define NM_AVAILABLE_IN_1_20 G_UNAVAILABLE(1, 20)
 #else
-    #define NM_AVAILABLE_IN_1_20
+#define NM_AVAILABLE_IN_1_20
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_22
-    #define NM_DEPRECATED_IN_1_22        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_22_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_22        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_22_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_22
-    #define NM_DEPRECATED_IN_1_22_FOR(f)
+#define NM_DEPRECATED_IN_1_22
+#define NM_DEPRECATED_IN_1_22_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_22
-    #define NM_AVAILABLE_IN_1_22 G_UNAVAILABLE(1, 22)
+#define NM_AVAILABLE_IN_1_22 G_UNAVAILABLE(1, 22)
 #else
-    #define NM_AVAILABLE_IN_1_22
+#define NM_AVAILABLE_IN_1_22
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_24
-    #define NM_DEPRECATED_IN_1_24        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_24_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_24        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_24_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_24
-    #define NM_DEPRECATED_IN_1_24_FOR(f)
+#define NM_DEPRECATED_IN_1_24
+#define NM_DEPRECATED_IN_1_24_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_24
-    #define NM_AVAILABLE_IN_1_24 G_UNAVAILABLE(1, 24)
+#define NM_AVAILABLE_IN_1_24 G_UNAVAILABLE(1, 24)
 #else
-    #define NM_AVAILABLE_IN_1_24
+#define NM_AVAILABLE_IN_1_24
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_26
-    #define NM_DEPRECATED_IN_1_26        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_26_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_26        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_26_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_26
-    #define NM_DEPRECATED_IN_1_26_FOR(f)
+#define NM_DEPRECATED_IN_1_26
+#define NM_DEPRECATED_IN_1_26_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_26
-    #define NM_AVAILABLE_IN_1_26 G_UNAVAILABLE(1, 26)
+#define NM_AVAILABLE_IN_1_26 G_UNAVAILABLE(1, 26)
 #else
-    #define NM_AVAILABLE_IN_1_26
+#define NM_AVAILABLE_IN_1_26
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_28
-    #define NM_DEPRECATED_IN_1_28        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_28_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_28        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_28_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_28
-    #define NM_DEPRECATED_IN_1_28_FOR(f)
+#define NM_DEPRECATED_IN_1_28
+#define NM_DEPRECATED_IN_1_28_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_28
-    #define NM_AVAILABLE_IN_1_28 G_UNAVAILABLE(1, 28)
+#define NM_AVAILABLE_IN_1_28 G_UNAVAILABLE(1, 28)
 #else
-    #define NM_AVAILABLE_IN_1_28
+#define NM_AVAILABLE_IN_1_28
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_30
-    #define NM_DEPRECATED_IN_1_30        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_30_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_30        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_30_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_30
-    #define NM_DEPRECATED_IN_1_30_FOR(f)
+#define NM_DEPRECATED_IN_1_30
+#define NM_DEPRECATED_IN_1_30_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_30
-    #define NM_AVAILABLE_IN_1_30 G_UNAVAILABLE(1, 30)
+#define NM_AVAILABLE_IN_1_30 G_UNAVAILABLE(1, 30)
 #else
-    #define NM_AVAILABLE_IN_1_30
+#define NM_AVAILABLE_IN_1_30
 #endif
 
 #if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_32
-    #define NM_DEPRECATED_IN_1_32        G_DEPRECATED
-    #define NM_DEPRECATED_IN_1_32_FOR(f) G_DEPRECATED_FOR(f)
+#define NM_DEPRECATED_IN_1_32        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_32_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_DEPRECATED_IN_1_32
-    #define NM_DEPRECATED_IN_1_32_FOR(f)
+#define NM_DEPRECATED_IN_1_32
+#define NM_DEPRECATED_IN_1_32_FOR(f)
 #endif
 
 #if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_32
-    #define NM_AVAILABLE_IN_1_32 G_UNAVAILABLE(1, 32)
+#define NM_AVAILABLE_IN_1_32 G_UNAVAILABLE(1, 32)
 #else
-    #define NM_AVAILABLE_IN_1_32
+#define NM_AVAILABLE_IN_1_32
 #endif
 
-#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_32_4
-    #define NM_AVAILABLE_IN_1_32_4 G_UNAVAILABLE(1, 32.4)
+#if NM_VERSION_MIN_REQUIRED >= NM_VERSION_1_34
+#define NM_DEPRECATED_IN_1_34        G_DEPRECATED
+#define NM_DEPRECATED_IN_1_34_FOR(f) G_DEPRECATED_FOR(f)
 #else
-    #define NM_AVAILABLE_IN_1_32_4
+#define NM_DEPRECATED_IN_1_34
+#define NM_DEPRECATED_IN_1_34_FOR(f)
+#endif
+
+#if NM_VERSION_MAX_ALLOWED < NM_VERSION_1_34
+#define NM_AVAILABLE_IN_1_34 G_UNAVAILABLE(1, 34)
+#else
+#define NM_AVAILABLE_IN_1_34
 #endif
 
 /*
diff --git a/src/libnm-core-public/nm-vpn-dbus-interface.h b/src/libnm-core-public/nm-vpn-dbus-interface.h
index c0e23f6f..518999dd 100644
--- a/src/libnm-core-public/nm-vpn-dbus-interface.h
+++ b/src/libnm-core-public/nm-vpn-dbus-interface.h
@@ -15,7 +15,7 @@
 #include "nm-dbus-interface.h"
 
 #ifndef NM_VERSION_H
-    #define NM_DEPRECATED_IN_1_8_FOR(n)
+#define NM_DEPRECATED_IN_1_8_FOR(n)
 #endif
 
 /*
@@ -171,7 +171,7 @@ typedef enum {
 } NMVpnPluginFailure;
 
 #ifndef NM_VERSION_H
-    #undef NM_DEPRECATED_IN_1_8_FOR
+#undef NM_DEPRECATED_IN_1_8_FOR
 #endif
 
 /*** Generic config ***/
diff --git a/src/libnm-core-public/nm-vpn-editor-plugin.h b/src/libnm-core-public/nm-vpn-editor-plugin.h
index e318da07..e25c358e 100644
--- a/src/libnm-core-public/nm-vpn-editor-plugin.h
+++ b/src/libnm-core-public/nm-vpn-editor-plugin.h
@@ -8,7 +8,7 @@
 #define __NM_VPN_EDITOR_PLUGIN_H__
 
 #if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
-    #error "Only <NetworkManager.h> can be included directly."
+#error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include <glib.h>