New upstream version 1.27.90 upstream/1.27.90

1 files changed, 31 insertions, 27 deletions

diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 15f70ca3..3899ed06 100644
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  * Copyright (C) 2008 Novell, Inc.
@@ -7,20 +7,24 @@
 #ifndef __NM_ACTIVE_CONNECTION_H__
 #define __NM_ACTIVE_CONNECTION_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-object.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_ACTIVE_CONNECTION            (nm_active_connection_get_type ())
-#define NM_ACTIVE_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection))
-#define NM_ACTIVE_CONNECTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
-#define NM_IS_ACTIVE_CONNECTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACTIVE_CONNECTION))
-#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACTIVE_CONNECTION))
-#define NM_ACTIVE_CONNECTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
+#define NM_TYPE_ACTIVE_CONNECTION (nm_active_connection_get_type())
+#define NM_ACTIVE_CONNECTION(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection))
+#define NM_ACTIVE_CONNECTION_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
+#define NM_IS_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_ACTIVE_CONNECTION))
+#define NM_IS_ACTIVE_CONNECTION_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_ACTIVE_CONNECTION))
+#define NM_ACTIVE_CONNECTION_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnectionClass))
 
 #define NM_ACTIVE_CONNECTION_CONNECTION           "connection"
 #define NM_ACTIVE_CONNECTION_ID                   "id"
@@ -44,27 +48,27 @@ G_BEGIN_DECLS
  */
 typedef struct _NMActiveConnectionClass NMActiveConnectionClass;
 
-GType nm_active_connection_get_type (void);
+GType nm_active_connection_get_type(void);
 
-NMRemoteConnection            *nm_active_connection_get_connection           (NMActiveConnection *connection);
-const char                    *nm_active_connection_get_id                   (NMActiveConnection *connection);
-const char                    *nm_active_connection_get_uuid                 (NMActiveConnection *connection);
-const char                    *nm_active_connection_get_connection_type      (NMActiveConnection *connection);
-const char                    *nm_active_connection_get_specific_object_path (NMActiveConnection *connection);
-const GPtrArray               *nm_active_connection_get_devices              (NMActiveConnection *connection);
-NMActiveConnectionState        nm_active_connection_get_state                (NMActiveConnection *connection);
+NMRemoteConnection *nm_active_connection_get_connection(NMActiveConnection *connection);
+const char *        nm_active_connection_get_id(NMActiveConnection *connection);
+const char *        nm_active_connection_get_uuid(NMActiveConnection *connection);
+const char *        nm_active_connection_get_connection_type(NMActiveConnection *connection);
+const char *        nm_active_connection_get_specific_object_path(NMActiveConnection *connection);
+const GPtrArray *   nm_active_connection_get_devices(NMActiveConnection *connection);
+NMActiveConnectionState nm_active_connection_get_state(NMActiveConnection *connection);
 NM_AVAILABLE_IN_1_10
-NMActivationStateFlags         nm_active_connection_get_state_flags          (NMActiveConnection *connection);
+NMActivationStateFlags nm_active_connection_get_state_flags(NMActiveConnection *connection);
 NM_AVAILABLE_IN_1_8
-NMActiveConnectionStateReason  nm_active_connection_get_state_reason         (NMActiveConnection *connection);
-NMDevice                      *nm_active_connection_get_master               (NMActiveConnection *connection);
-gboolean                       nm_active_connection_get_default              (NMActiveConnection *connection);
-NMIPConfig                    *nm_active_connection_get_ip4_config           (NMActiveConnection *connection);
-NMDhcpConfig                  *nm_active_connection_get_dhcp4_config         (NMActiveConnection *connection);
-gboolean                       nm_active_connection_get_default6             (NMActiveConnection *connection);
-NMIPConfig                    *nm_active_connection_get_ip6_config           (NMActiveConnection *connection);
-NMDhcpConfig                  *nm_active_connection_get_dhcp6_config         (NMActiveConnection *connection);
-gboolean                       nm_active_connection_get_vpn                  (NMActiveConnection *connection);
+NMActiveConnectionStateReason nm_active_connection_get_state_reason(NMActiveConnection *connection);
+NMDevice *                    nm_active_connection_get_master(NMActiveConnection *connection);
+gboolean                      nm_active_connection_get_default(NMActiveConnection *connection);
+NMIPConfig *                  nm_active_connection_get_ip4_config(NMActiveConnection *connection);
+NMDhcpConfig *                nm_active_connection_get_dhcp4_config(NMActiveConnection *connection);
+gboolean                      nm_active_connection_get_default6(NMActiveConnection *connection);
+NMIPConfig *                  nm_active_connection_get_ip6_config(NMActiveConnection *connection);
+NMDhcpConfig *                nm_active_connection_get_dhcp6_config(NMActiveConnection *connection);
+gboolean                      nm_active_connection_get_vpn(NMActiveConnection *connection);
 
 G_END_DECLS