New upstream version 1.35.91 upstream/1.35.91

12 files changed, 227 insertions, 227 deletions

diff --git a/src/libnm-client-public/nm-access-point.h b/src/libnm-client-public/nm-access-point.h
index 50a74296..9f9216bb 100644
--- a/src/libnm-client-public/nm-access-point.h
+++ b/src/libnm-client-public/nm-access-point.h
@@ -49,8 +49,8 @@ GType nm_access_point_get_type(void);
 NM80211ApFlags         nm_access_point_get_flags(NMAccessPoint *ap);
 NM80211ApSecurityFlags nm_access_point_get_wpa_flags(NMAccessPoint *ap);
 NM80211ApSecurityFlags nm_access_point_get_rsn_flags(NMAccessPoint *ap);
-GBytes *               nm_access_point_get_ssid(NMAccessPoint *ap);
-const char *           nm_access_point_get_bssid(NMAccessPoint *ap);
+GBytes                *nm_access_point_get_ssid(NMAccessPoint *ap);
+const char            *nm_access_point_get_bssid(NMAccessPoint *ap);
 guint32                nm_access_point_get_frequency(NMAccessPoint *ap);
 NM80211Mode            nm_access_point_get_mode(NMAccessPoint *ap);
 guint32                nm_access_point_get_max_bitrate(NMAccessPoint *ap);
diff --git a/src/libnm-client-public/nm-active-connection.h b/src/libnm-client-public/nm-active-connection.h
index 76ea107a..a65b4f20 100644
--- a/src/libnm-client-public/nm-active-connection.h
+++ b/src/libnm-client-public/nm-active-connection.h
@@ -51,23 +51,23 @@ typedef struct _NMActiveConnectionClass NMActiveConnectionClass;
 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);
+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);
 NM_AVAILABLE_IN_1_8
 NMActiveConnectionStateReason nm_active_connection_get_state_reason(NMActiveConnection *connection);
-NMDevice *                    nm_active_connection_get_master(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);
+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);
+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
diff --git a/src/libnm-client-public/nm-client.h b/src/libnm-client-public/nm-client.h
index 02c8ee33..ac615b57 100644
--- a/src/libnm-client-public/nm-client.h
+++ b/src/libnm-client-public/nm-client.h
@@ -233,7 +233,7 @@ _NM_DEPRECATED_SYNC_METHOD
 gboolean
 nm_client_set_logging(NMClient *client, const char *level, const char *domains, GError **error);
 
-NMClientPermissionResult nm_client_get_permission_result(NMClient *         client,
+NMClientPermissionResult nm_client_get_permission_result(NMClient          *client,
                                                          NMClientPermission permission);
 
 NM_AVAILABLE_IN_1_24
@@ -246,22 +246,22 @@ NM_DEPRECATED_IN_1_22
 NMConnectivityState
 nm_client_check_connectivity(NMClient *client, GCancellable *cancellable, GError **error);
 
-void nm_client_check_connectivity_async(NMClient *          client,
-                                        GCancellable *      cancellable,
+void nm_client_check_connectivity_async(NMClient           *client,
+                                        GCancellable       *cancellable,
                                         GAsyncReadyCallback callback,
                                         gpointer            user_data);
 NMConnectivityState
 nm_client_check_connectivity_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 _NM_DEPRECATED_SYNC_METHOD
-gboolean nm_client_save_hostname(NMClient *    client,
-                                 const char *  hostname,
+gboolean nm_client_save_hostname(NMClient     *client,
+                                 const char   *hostname,
                                  GCancellable *cancellable,
-                                 GError **     error);
+                                 GError      **error);
 
-void     nm_client_save_hostname_async(NMClient *          client,
-                                       const char *        hostname,
-                                       GCancellable *      cancellable,
+void     nm_client_save_hostname_async(NMClient           *client,
+                                       const char         *hostname,
+                                       GCancellable       *cancellable,
                                        GAsyncReadyCallback callback,
                                        gpointer            user_data);
 gboolean nm_client_save_hostname_finish(NMClient *client, GAsyncResult *result, GError **error);
@@ -271,8 +271,8 @@ gboolean nm_client_save_hostname_finish(NMClient *client, GAsyncResult *result,
 const GPtrArray *nm_client_get_devices(NMClient *client);
 NM_AVAILABLE_IN_1_2
 const GPtrArray *nm_client_get_all_devices(NMClient *client);
-NMDevice *       nm_client_get_device_by_path(NMClient *client, const char *object_path);
-NMDevice *       nm_client_get_device_by_iface(NMClient *client, const char *iface);
+NMDevice        *nm_client_get_device_by_path(NMClient *client, const char *object_path);
+NMDevice        *nm_client_get_device_by_iface(NMClient *client, const char *iface);
 
 /* Active Connections */
 
@@ -281,51 +281,51 @@ const GPtrArray *nm_client_get_active_connections(NMClient *client);
 NMActiveConnection *nm_client_get_primary_connection(NMClient *client);
 NMActiveConnection *nm_client_get_activating_connection(NMClient *client);
 
-void nm_client_activate_connection_async(NMClient *          client,
-                                         NMConnection *      connection,
-                                         NMDevice *          device,
-                                         const char *        specific_object,
-                                         GCancellable *      cancellable,
+void nm_client_activate_connection_async(NMClient           *client,
+                                         NMConnection       *connection,
+                                         NMDevice           *device,
+                                         const char         *specific_object,
+                                         GCancellable       *cancellable,
                                          GAsyncReadyCallback callback,
                                          gpointer            user_data);
 NMActiveConnection *
 nm_client_activate_connection_finish(NMClient *client, GAsyncResult *result, GError **error);
 
-void                nm_client_add_and_activate_connection_async(NMClient *          client,
-                                                                NMConnection *      partial,
-                                                                NMDevice *          device,
-                                                                const char *        specific_object,
-                                                                GCancellable *      cancellable,
+void                nm_client_add_and_activate_connection_async(NMClient           *client,
+                                                                NMConnection       *partial,
+                                                                NMDevice           *device,
+                                                                const char         *specific_object,
+                                                                GCancellable       *cancellable,
                                                                 GAsyncReadyCallback callback,
                                                                 gpointer            user_data);
-NMActiveConnection *nm_client_add_and_activate_connection_finish(NMClient *    client,
+NMActiveConnection *nm_client_add_and_activate_connection_finish(NMClient     *client,
                                                                  GAsyncResult *result,
-                                                                 GError **     error);
+                                                                 GError      **error);
 
 NM_AVAILABLE_IN_1_16
-void nm_client_add_and_activate_connection2(NMClient *          client,
-                                            NMConnection *      partial,
-                                            NMDevice *          device,
-                                            const char *        specific_object,
-                                            GVariant *          options,
-                                            GCancellable *      cancellable,
+void nm_client_add_and_activate_connection2(NMClient           *client,
+                                            NMConnection       *partial,
+                                            NMDevice           *device,
+                                            const char         *specific_object,
+                                            GVariant           *options,
+                                            GCancellable       *cancellable,
                                             GAsyncReadyCallback callback,
                                             gpointer            user_data);
 NM_AVAILABLE_IN_1_16
-NMActiveConnection *nm_client_add_and_activate_connection2_finish(NMClient *    client,
+NMActiveConnection *nm_client_add_and_activate_connection2_finish(NMClient     *client,
                                                                   GAsyncResult *result,
-                                                                  GVariant **   out_result,
-                                                                  GError **     error);
+                                                                  GVariant    **out_result,
+                                                                  GError      **error);
 
 _NM_DEPRECATED_SYNC_METHOD
-gboolean nm_client_deactivate_connection(NMClient *          client,
+gboolean nm_client_deactivate_connection(NMClient           *client,
                                          NMActiveConnection *active,
-                                         GCancellable *      cancellable,
-                                         GError **           error);
+                                         GCancellable       *cancellable,
+                                         GError            **error);
 
-void nm_client_deactivate_connection_async(NMClient *          client,
+void nm_client_deactivate_connection_async(NMClient           *client,
                                            NMActiveConnection *active,
-                                           GCancellable *      cancellable,
+                                           GCancellable       *cancellable,
                                            GAsyncReadyCallback callback,
                                            gpointer            user_data);
 gboolean
@@ -339,53 +339,53 @@ NMRemoteConnection *nm_client_get_connection_by_id(NMClient *client, const char
 NMRemoteConnection *nm_client_get_connection_by_path(NMClient *client, const char *path);
 NMRemoteConnection *nm_client_get_connection_by_uuid(NMClient *client, const char *uuid);
 
-void nm_client_add_connection_async(NMClient *          client,
-                                    NMConnection *      connection,
+void nm_client_add_connection_async(NMClient           *client,
+                                    NMConnection       *connection,
                                     gboolean            save_to_disk,
-                                    GCancellable *      cancellable,
+                                    GCancellable       *cancellable,
                                     GAsyncReadyCallback callback,
                                     gpointer            user_data);
 NMRemoteConnection *
 nm_client_add_connection_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_20
-void nm_client_add_connection2(NMClient *                    client,
-                               GVariant *                    settings,
+void nm_client_add_connection2(NMClient                     *client,
+                               GVariant                     *settings,
                                NMSettingsAddConnection2Flags flags,
-                               GVariant *                    args,
+                               GVariant                     *args,
                                gboolean                      ignore_out_result,
-                               GCancellable *                cancellable,
+                               GCancellable                 *cancellable,
                                GAsyncReadyCallback           callback,
                                gpointer                      user_data);
 
 NM_AVAILABLE_IN_1_20
-NMRemoteConnection *nm_client_add_connection2_finish(NMClient *    client,
+NMRemoteConnection *nm_client_add_connection2_finish(NMClient     *client,
                                                      GAsyncResult *result,
-                                                     GVariant **   out_result,
-                                                     GError **     error);
+                                                     GVariant    **out_result,
+                                                     GError      **error);
 
 _NM_DEPRECATED_SYNC_METHOD
-gboolean nm_client_load_connections(NMClient *    client,
-                                    char **       filenames,
-                                    char ***      failures,
+gboolean nm_client_load_connections(NMClient     *client,
+                                    char        **filenames,
+                                    char       ***failures,
                                     GCancellable *cancellable,
-                                    GError **     error);
+                                    GError      **error);
 
-void     nm_client_load_connections_async(NMClient *          client,
-                                          char **             filenames,
-                                          GCancellable *      cancellable,
+void     nm_client_load_connections_async(NMClient           *client,
+                                          char              **filenames,
+                                          GCancellable       *cancellable,
                                           GAsyncReadyCallback callback,
                                           gpointer            user_data);
-gboolean nm_client_load_connections_finish(NMClient *    client,
-                                           char ***      failures,
+gboolean nm_client_load_connections_finish(NMClient     *client,
+                                           char       ***failures,
                                            GAsyncResult *result,
-                                           GError **     error);
+                                           GError      **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_client_reload_connections(NMClient *client, GCancellable *cancellable, GError **error);
 
-void nm_client_reload_connections_async(NMClient *          client,
-                                        GCancellable *      cancellable,
+void nm_client_reload_connections_async(NMClient           *client,
+                                        GCancellable       *cancellable,
                                         GAsyncReadyCallback callback,
                                         gpointer            user_data);
 gboolean
@@ -402,11 +402,11 @@ NM_AVAILABLE_IN_1_12
 const GPtrArray *nm_client_get_checkpoints(NMClient *client);
 
 NM_AVAILABLE_IN_1_12
-void nm_client_checkpoint_create(NMClient *              client,
-                                 const GPtrArray *       devices,
+void nm_client_checkpoint_create(NMClient               *client,
+                                 const GPtrArray        *devices,
                                  guint32                 rollback_timeout,
                                  NMCheckpointCreateFlags flags,
-                                 GCancellable *          cancellable,
+                                 GCancellable           *cancellable,
                                  GAsyncReadyCallback     callback,
                                  gpointer                user_data);
 NM_AVAILABLE_IN_1_12
@@ -414,9 +414,9 @@ NMCheckpoint *
 nm_client_checkpoint_create_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_12
-void nm_client_checkpoint_destroy(NMClient *          client,
-                                  const char *        checkpoint_path,
-                                  GCancellable *      cancellable,
+void nm_client_checkpoint_destroy(NMClient           *client,
+                                  const char         *checkpoint_path,
+                                  GCancellable       *cancellable,
                                   GAsyncReadyCallback callback,
                                   gpointer            user_data);
 NM_AVAILABLE_IN_1_12
@@ -424,9 +424,9 @@ gboolean
 nm_client_checkpoint_destroy_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_12
-void nm_client_checkpoint_rollback(NMClient *          client,
-                                   const char *        checkpoint_path,
-                                   GCancellable *      cancellable,
+void nm_client_checkpoint_rollback(NMClient           *client,
+                                   const char         *checkpoint_path,
+                                   GCancellable       *cancellable,
                                    GAsyncReadyCallback callback,
                                    gpointer            user_data);
 NM_AVAILABLE_IN_1_12
@@ -434,22 +434,22 @@ GHashTable *
 nm_client_checkpoint_rollback_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_12
-void nm_client_checkpoint_adjust_rollback_timeout(NMClient *          client,
-                                                  const char *        checkpoint_path,
+void nm_client_checkpoint_adjust_rollback_timeout(NMClient           *client,
+                                                  const char         *checkpoint_path,
                                                   guint32             add_timeout,
-                                                  GCancellable *      cancellable,
+                                                  GCancellable       *cancellable,
                                                   GAsyncReadyCallback callback,
                                                   gpointer            user_data);
 
 NM_AVAILABLE_IN_1_12
-gboolean nm_client_checkpoint_adjust_rollback_timeout_finish(NMClient *    client,
+gboolean nm_client_checkpoint_adjust_rollback_timeout_finish(NMClient     *client,
                                                              GAsyncResult *result,
-                                                             GError **     error);
+                                                             GError      **error);
 
 NM_AVAILABLE_IN_1_22
-void nm_client_reload(NMClient *           client,
+void nm_client_reload(NMClient            *client,
                       NMManagerReloadFlags flags,
-                      GCancellable *       cancellable,
+                      GCancellable        *cancellable,
                       GAsyncReadyCallback  callback,
                       gpointer             user_data);
 NM_AVAILABLE_IN_1_22
@@ -458,14 +458,14 @@ gboolean nm_client_reload_finish(NMClient *client, GAsyncResult *result, GError
 /*****************************************************************************/
 
 NM_AVAILABLE_IN_1_24
-void nm_client_dbus_call(NMClient *          client,
-                         const char *        object_path,
-                         const char *        interface_name,
-                         const char *        method_name,
-                         GVariant *          parameters,
+void nm_client_dbus_call(NMClient           *client,
+                         const char         *object_path,
+                         const char         *interface_name,
+                         const char         *method_name,
+                         GVariant           *parameters,
                          const GVariantType *reply_type,
                          int                 timeout_msec,
-                         GCancellable *      cancellable,
+                         GCancellable       *cancellable,
                          GAsyncReadyCallback callback,
                          gpointer            user_data);
 
@@ -473,13 +473,13 @@ NM_AVAILABLE_IN_1_24
 GVariant *nm_client_dbus_call_finish(NMClient *client, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_24
-void nm_client_dbus_set_property(NMClient *          client,
-                                 const char *        object_path,
-                                 const char *        interface_name,
-                                 const char *        property_name,
-                                 GVariant *          value,
+void nm_client_dbus_set_property(NMClient           *client,
+                                 const char         *object_path,
+                                 const char         *interface_name,
+                                 const char         *property_name,
+                                 GVariant           *value,
                                  int                 timeout_msec,
-                                 GCancellable *      cancellable,
+                                 GCancellable       *cancellable,
                                  GAsyncReadyCallback callback,
                                  gpointer            user_data);
 
diff --git a/src/libnm-client-public/nm-device-wifi-p2p.h b/src/libnm-client-public/nm-device-wifi-p2p.h
index 3395ca29..cf68b496 100644
--- a/src/libnm-client-public/nm-device-wifi-p2p.h
+++ b/src/libnm-client-public/nm-device-wifi-p2p.h
@@ -50,9 +50,9 @@ NM_AVAILABLE_IN_1_16
 const GPtrArray *nm_device_wifi_p2p_get_peers(NMDeviceWifiP2P *device);
 
 NM_AVAILABLE_IN_1_16
-void nm_device_wifi_p2p_start_find(NMDeviceWifiP2P *   device,
-                                   GVariant *          options,
-                                   GCancellable *      cancellable,
+void nm_device_wifi_p2p_start_find(NMDeviceWifiP2P    *device,
+                                   GVariant           *options,
+                                   GCancellable       *cancellable,
                                    GAsyncReadyCallback callback,
                                    gpointer            user_data);
 NM_AVAILABLE_IN_1_16
@@ -60,8 +60,8 @@ gboolean
 nm_device_wifi_p2p_start_find_finish(NMDeviceWifiP2P *device, GAsyncResult *result, GError **error);
 
 NM_AVAILABLE_IN_1_16
-void nm_device_wifi_p2p_stop_find(NMDeviceWifiP2P *   device,
-                                  GCancellable *      cancellable,
+void nm_device_wifi_p2p_stop_find(NMDeviceWifiP2P    *device,
+                                  GCancellable       *cancellable,
                                   GAsyncReadyCallback callback,
                                   gpointer            user_data);
 NM_AVAILABLE_IN_1_16
diff --git a/src/libnm-client-public/nm-device-wifi.h b/src/libnm-client-public/nm-device-wifi.h
index 85062f51..1c767316 100644
--- a/src/libnm-client-public/nm-device-wifi.h
+++ b/src/libnm-client-public/nm-device-wifi.h
@@ -43,11 +43,11 @@ GType nm_device_wifi_get_type(void);
 NM_DEPRECATED_IN_1_24_FOR(nm_device_get_hw_address)
 const char *nm_device_wifi_get_hw_address(NMDeviceWifi *device);
 
-const char *             nm_device_wifi_get_permanent_hw_address(NMDeviceWifi *device);
+const char              *nm_device_wifi_get_permanent_hw_address(NMDeviceWifi *device);
 NM80211Mode              nm_device_wifi_get_mode(NMDeviceWifi *device);
 guint32                  nm_device_wifi_get_bitrate(NMDeviceWifi *device);
 NMDeviceWifiCapabilities nm_device_wifi_get_capabilities(NMDeviceWifi *device);
-NMAccessPoint *          nm_device_wifi_get_active_access_point(NMDeviceWifi *device);
+NMAccessPoint           *nm_device_wifi_get_active_access_point(NMDeviceWifi *device);
 
 NMAccessPoint *nm_device_wifi_get_access_point_by_path(NMDeviceWifi *device, const char *path);
 
@@ -62,17 +62,17 @@ nm_device_wifi_request_scan(NMDeviceWifi *device, GCancellable *cancellable, GEr
 NM_AVAILABLE_IN_1_2
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_device_wifi_request_scan_options(NMDeviceWifi *device,
-                                             GVariant *    options,
+                                             GVariant     *options,
                                              GCancellable *cancellable,
-                                             GError **     error);
-void     nm_device_wifi_request_scan_async(NMDeviceWifi *      device,
-                                           GCancellable *      cancellable,
+                                             GError      **error);
+void     nm_device_wifi_request_scan_async(NMDeviceWifi       *device,
+                                           GCancellable       *cancellable,
                                            GAsyncReadyCallback callback,
                                            gpointer            user_data);
 NM_AVAILABLE_IN_1_2
-void nm_device_wifi_request_scan_options_async(NMDeviceWifi *      device,
-                                               GVariant *          options,
-                                               GCancellable *      cancellable,
+void nm_device_wifi_request_scan_options_async(NMDeviceWifi       *device,
+                                               GVariant           *options,
+                                               GCancellable       *cancellable,
                                                GAsyncReadyCallback callback,
                                                gpointer            user_data);
 gboolean
diff --git a/src/libnm-client-public/nm-device.h b/src/libnm-client-public/nm-device.h
index 23b1a805..9e9dbea6 100644
--- a/src/libnm-client-public/nm-device.h
+++ b/src/libnm-client-public/nm-device.h
@@ -128,17 +128,17 @@ typedef struct _NMLldpNeighbor NMLldpNeighbor;
 
 GType nm_device_get_type(void);
 
-const char * nm_device_get_iface(NMDevice *device);
-const char * nm_device_get_ip_iface(NMDevice *device);
+const char  *nm_device_get_iface(NMDevice *device);
+const char  *nm_device_get_ip_iface(NMDevice *device);
 NMDeviceType nm_device_get_device_type(NMDevice *device);
-const char * nm_device_get_udi(NMDevice *device);
+const char  *nm_device_get_udi(NMDevice *device);
 NM_AVAILABLE_IN_1_26
-const char *         nm_device_get_path(NMDevice *device);
-const char *         nm_device_get_driver(NMDevice *device);
-const char *         nm_device_get_driver_version(NMDevice *device);
-const char *         nm_device_get_firmware_version(NMDevice *device);
-const char *         nm_device_get_type_description(NMDevice *device);
-const char *         nm_device_get_hw_address(NMDevice *device);
+const char          *nm_device_get_path(NMDevice *device);
+const char          *nm_device_get_driver(NMDevice *device);
+const char          *nm_device_get_driver_version(NMDevice *device);
+const char          *nm_device_get_firmware_version(NMDevice *device);
+const char          *nm_device_get_type_description(NMDevice *device);
+const char          *nm_device_get_hw_address(NMDevice *device);
 NMDeviceCapabilities nm_device_get_capabilities(NMDevice *device);
 gboolean             nm_device_get_managed(NMDevice *device);
 
@@ -159,17 +159,17 @@ void nm_device_set_autoconnect(NMDevice *device, gboolean autoconnect);
 gboolean nm_device_get_firmware_missing(NMDevice *device);
 NM_AVAILABLE_IN_1_2
 gboolean      nm_device_get_nm_plugin_missing(NMDevice *device);
-NMIPConfig *  nm_device_get_ip4_config(NMDevice *device);
+NMIPConfig   *nm_device_get_ip4_config(NMDevice *device);
 NMDhcpConfig *nm_device_get_dhcp4_config(NMDevice *device);
-NMIPConfig *  nm_device_get_ip6_config(NMDevice *device);
+NMIPConfig   *nm_device_get_ip6_config(NMDevice *device);
 NMDhcpConfig *nm_device_get_dhcp6_config(NMDevice *device);
 NM_AVAILABLE_IN_1_16
 NMConnectivityState nm_device_get_connectivity(NMDevice *device, int addr_family);
 NMDeviceState       nm_device_get_state(NMDevice *device);
 NMDeviceStateReason nm_device_get_state_reason(NMDevice *device);
 NMActiveConnection *nm_device_get_active_connection(NMDevice *device);
-const GPtrArray *   nm_device_get_available_connections(NMDevice *device);
-const char *        nm_device_get_physical_port_id(NMDevice *device);
+const GPtrArray    *nm_device_get_available_connections(NMDevice *device);
+const char         *nm_device_get_physical_port_id(NMDevice *device);
 guint32             nm_device_get_mtu(NMDevice *device);
 NM_AVAILABLE_IN_1_2
 gboolean nm_device_is_real(NMDevice *device);
@@ -188,18 +188,18 @@ NMDeviceInterfaceFlags nm_device_get_interface_flags(NMDevice *device);
 char **nm_device_disambiguate_names(NMDevice **devices, int num_devices);
 NM_AVAILABLE_IN_1_2
 _NM_DEPRECATED_SYNC_METHOD
-gboolean nm_device_reapply(NMDevice *    device,
+gboolean nm_device_reapply(NMDevice     *device,
                            NMConnection *connection,
                            guint64       version_id,
                            guint32       flags,
                            GCancellable *cancellable,
-                           GError **     error);
+                           GError      **error);
 NM_AVAILABLE_IN_1_2
-void nm_device_reapply_async(NMDevice *          device,
-                             NMConnection *      connection,
+void nm_device_reapply_async(NMDevice           *device,
+                             NMConnection       *connection,
                              guint64             version_id,
                              guint32             flags,
-                             GCancellable *      cancellable,
+                             GCancellable       *cancellable,
                              GAsyncReadyCallback callback,
                              gpointer            user_data);
 NM_AVAILABLE_IN_1_2
@@ -207,35 +207,35 @@ gboolean nm_device_reapply_finish(NMDevice *device, GAsyncResult *result, GError
 
 NM_AVAILABLE_IN_1_2
 _NM_DEPRECATED_SYNC_METHOD
-NMConnection *nm_device_get_applied_connection(NMDevice *    device,
+NMConnection *nm_device_get_applied_connection(NMDevice     *device,
                                                guint32       flags,
-                                               guint64 *     version_id,
+                                               guint64      *version_id,
                                                GCancellable *cancellable,
-                                               GError **     error);
+                                               GError      **error);
 NM_AVAILABLE_IN_1_2
-void nm_device_get_applied_connection_async(NMDevice *          device,
+void nm_device_get_applied_connection_async(NMDevice           *device,
                                             guint32             flags,
-                                            GCancellable *      cancellable,
+                                            GCancellable       *cancellable,
                                             GAsyncReadyCallback callback,
                                             gpointer            user_data);
 NM_AVAILABLE_IN_1_2
-NMConnection *nm_device_get_applied_connection_finish(NMDevice *    device,
+NMConnection *nm_device_get_applied_connection_finish(NMDevice     *device,
                                                       GAsyncResult *result,
-                                                      guint64 *     version_id,
-                                                      GError **     error);
+                                                      guint64      *version_id,
+                                                      GError      **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_device_disconnect(NMDevice *device, GCancellable *cancellable, GError **error);
-void     nm_device_disconnect_async(NMDevice *          device,
-                                    GCancellable *      cancellable,
+void     nm_device_disconnect_async(NMDevice           *device,
+                                    GCancellable       *cancellable,
                                     GAsyncReadyCallback callback,
                                     gpointer            user_data);
 gboolean nm_device_disconnect_finish(NMDevice *device, GAsyncResult *result, GError **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_device_delete(NMDevice *device, GCancellable *cancellable, GError **error);
-void     nm_device_delete_async(NMDevice *          device,
-                                GCancellable *      cancellable,
+void     nm_device_delete_async(NMDevice           *device,
+                                GCancellable       *cancellable,
                                 GAsyncReadyCallback callback,
                                 gpointer            user_data);
 gboolean nm_device_delete_finish(NMDevice *device, GAsyncResult *result, GError **error);
@@ -264,8 +264,8 @@ NM_AVAILABLE_IN_1_2
 NMLldpNeighbor *nm_lldp_neighbor_new(void);
 NM_AVAILABLE_IN_1_2
 gboolean nm_lldp_neighbor_get_attr_string_value(NMLldpNeighbor *neighbor,
-                                                const char *    name,
-                                                const char **   out_value);
+                                                const char     *name,
+                                                const char    **out_value);
 NM_AVAILABLE_IN_1_2
 gboolean
 nm_lldp_neighbor_get_attr_uint_value(NMLldpNeighbor *neighbor, const char *name, guint *out_value);
diff --git a/src/libnm-client-public/nm-ip-config.h b/src/libnm-client-public/nm-ip-config.h
index a63dea67..99b1948d 100644
--- a/src/libnm-client-public/nm-ip-config.h
+++ b/src/libnm-client-public/nm-ip-config.h
@@ -41,9 +41,9 @@ typedef struct _NMIPConfigClass NMIPConfigClass;
 GType nm_ip_config_get_type(void);
 
 int                nm_ip_config_get_family(NMIPConfig *config);
-const char *       nm_ip_config_get_gateway(NMIPConfig *config);
-GPtrArray *        nm_ip_config_get_addresses(NMIPConfig *config);
-GPtrArray *        nm_ip_config_get_routes(NMIPConfig *config);
+const char        *nm_ip_config_get_gateway(NMIPConfig *config);
+GPtrArray         *nm_ip_config_get_addresses(NMIPConfig *config);
+GPtrArray         *nm_ip_config_get_routes(NMIPConfig *config);
 const char *const *nm_ip_config_get_nameservers(NMIPConfig *config);
 const char *const *nm_ip_config_get_domains(NMIPConfig *config);
 const char *const *nm_ip_config_get_searches(NMIPConfig *config);
diff --git a/src/libnm-client-public/nm-remote-connection.h b/src/libnm-client-public/nm-remote-connection.h
index 06088e86..6104ecb8 100644
--- a/src/libnm-client-public/nm-remote-connection.h
+++ b/src/libnm-client-public/nm-remote-connection.h
@@ -42,73 +42,73 @@ typedef struct _NMRemoteConnectionClass NMRemoteConnectionClass;
 GType nm_remote_connection_get_type(void);
 
 NM_AVAILABLE_IN_1_12
-void nm_remote_connection_update2(NMRemoteConnection *   connection,
-                                  GVariant *             settings,
+void nm_remote_connection_update2(NMRemoteConnection    *connection,
+                                  GVariant              *settings,
                                   NMSettingsUpdate2Flags flags,
-                                  GVariant *             args,
-                                  GCancellable *         cancellable,
+                                  GVariant              *args,
+                                  GCancellable          *cancellable,
                                   GAsyncReadyCallback    callback,
                                   gpointer               user_data);
 NM_AVAILABLE_IN_1_12
 GVariant *nm_remote_connection_update2_finish(NMRemoteConnection *connection,
-                                              GAsyncResult *      result,
-                                              GError **           error);
+                                              GAsyncResult       *result,
+                                              GError            **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_remote_connection_commit_changes(NMRemoteConnection *connection,
                                              gboolean            save_to_disk,
-                                             GCancellable *      cancellable,
-                                             GError **           error);
+                                             GCancellable       *cancellable,
+                                             GError            **error);
 
 void     nm_remote_connection_commit_changes_async(NMRemoteConnection *connection,
                                                    gboolean            save_to_disk,
-                                                   GCancellable *      cancellable,
+                                                   GCancellable       *cancellable,
                                                    GAsyncReadyCallback callback,
                                                    gpointer            user_data);
 gboolean nm_remote_connection_commit_changes_finish(NMRemoteConnection *connection,
-                                                    GAsyncResult *      result,
-                                                    GError **           error);
+                                                    GAsyncResult       *result,
+                                                    GError            **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_remote_connection_save(NMRemoteConnection *connection,
-                                   GCancellable *      cancellable,
-                                   GError **           error);
+                                   GCancellable       *cancellable,
+                                   GError            **error);
 
 void     nm_remote_connection_save_async(NMRemoteConnection *connection,
-                                         GCancellable *      cancellable,
+                                         GCancellable       *cancellable,
                                          GAsyncReadyCallback callback,
                                          gpointer            user_data);
 gboolean nm_remote_connection_save_finish(NMRemoteConnection *connection,
-                                          GAsyncResult *      result,
-                                          GError **           error);
+                                          GAsyncResult       *result,
+                                          GError            **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 gboolean nm_remote_connection_delete(NMRemoteConnection *connection,
-                                     GCancellable *      cancellable,
-                                     GError **           error);
+                                     GCancellable       *cancellable,
+                                     GError            **error);
 
 void     nm_remote_connection_delete_async(NMRemoteConnection *connection,
-                                           GCancellable *      cancellable,
+                                           GCancellable       *cancellable,
                                            GAsyncReadyCallback callback,
                                            gpointer            user_data);
 gboolean nm_remote_connection_delete_finish(NMRemoteConnection *connection,
-                                            GAsyncResult *      result,
-                                            GError **           error);
+                                            GAsyncResult       *result,
+                                            GError            **error);
 
 _NM_DEPRECATED_SYNC_METHOD
 GVariant *nm_remote_connection_get_secrets(NMRemoteConnection *connection,
-                                           const char *        setting_name,
-                                           GCancellable *      cancellable,
-                                           GError **           error);
+                                           const char         *setting_name,
+                                           GCancellable       *cancellable,
+                                           GError            **error);
 
 void      nm_remote_connection_get_secrets_async(NMRemoteConnection *connection,
-                                                 const char *        setting_name,
-                                                 GCancellable *      cancellable,
+                                                 const char         *setting_name,
+                                                 GCancellable       *cancellable,
                                                  GAsyncReadyCallback callback,
                                                  gpointer            user_data);
 GVariant *nm_remote_connection_get_secrets_finish(NMRemoteConnection *connection,
-                                                  GAsyncResult *      result,
-                                                  GError **           error);
+                                                  GAsyncResult       *result,
+                                                  GError            **error);
 
 gboolean nm_remote_connection_get_unsaved(NMRemoteConnection *connection);
 
diff --git a/src/libnm-client-public/nm-secret-agent-old.h b/src/libnm-client-public/nm-secret-agent-old.h
index cc33c14a..b45b12bb 100644
--- a/src/libnm-client-public/nm-secret-agent-old.h
+++ b/src/libnm-client-public/nm-secret-agent-old.h
@@ -80,9 +80,9 @@ typedef struct {
  * </example>
  */
 typedef void (*NMSecretAgentOldGetSecretsFunc)(NMSecretAgentOld *agent,
-                                               NMConnection *    connection,
-                                               GVariant *        secrets,
-                                               GError *          error,
+                                               NMConnection     *connection,
+                                               GVariant         *secrets,
+                                               GError           *error,
                                                gpointer          user_data);
 
 /**
@@ -100,8 +100,8 @@ typedef void (*NMSecretAgentOldGetSecretsFunc)(NMSecretAgentOld *agent,
  * should be called.
  */
 typedef void (*NMSecretAgentOldSaveSecretsFunc)(NMSecretAgentOld *agent,
-                                                NMConnection *    connection,
-                                                GError *          error,
+                                                NMConnection     *connection,
+                                                GError           *error,
                                                 gpointer          user_data);
 
 /**
@@ -119,8 +119,8 @@ typedef void (*NMSecretAgentOldSaveSecretsFunc)(NMSecretAgentOld *agent,
  * should be called.
  */
 typedef void (*NMSecretAgentOldDeleteSecretsFunc)(NMSecretAgentOld *agent,
-                                                  NMConnection *    connection,
-                                                  GError *          error,
+                                                  NMConnection     *connection,
+                                                  GError           *error,
                                                   gpointer          user_data);
 
 typedef struct {
@@ -138,11 +138,11 @@ typedef struct {
      * error. Since 1.24, invoking the callback has no effect during cancellation
      * and may be omitted.
      */
-    void (*get_secrets)(NMSecretAgentOld *             self,
-                        NMConnection *                 connection,
-                        const char *                   connection_path,
-                        const char *                   setting_name,
-                        const char **                  hints,
+    void (*get_secrets)(NMSecretAgentOld              *self,
+                        NMConnection                  *connection,
+                        const char                    *connection_path,
+                        const char                    *setting_name,
+                        const char                   **hints,
                         NMSecretAgentGetSecretsFlags   flags,
                         NMSecretAgentOldGetSecretsFunc callback,
                         gpointer                       user_data);
@@ -156,8 +156,8 @@ typedef struct {
      * the get_secrets callback will be ignored during cancellation and may be omitted.
      */
     void (*cancel_get_secrets)(NMSecretAgentOld *self,
-                               const char *      connection_path,
-                               const char *      setting_name);
+                               const char       *connection_path,
+                               const char       *setting_name);
 
     /* Called when the subclass should save the secrets contained in the
      * connection to backing storage.  Subclass must copy or reference any
@@ -165,9 +165,9 @@ typedef struct {
      * arguments will freed (except for 'self', 'callback', and 'user_data'
      * of course).
      */
-    void (*save_secrets)(NMSecretAgentOld *              self,
-                         NMConnection *                  connection,
-                         const char *                    connection_path,
+    void (*save_secrets)(NMSecretAgentOld               *self,
+                         NMConnection                   *connection,
+                         const char                     *connection_path,
                          NMSecretAgentOldSaveSecretsFunc callback,
                          gpointer                        user_data);
 
@@ -177,9 +177,9 @@ typedef struct {
      * arguments will freed (except for 'self', 'callback', and 'user_data'
      * of course).
      */
-    void (*delete_secrets)(NMSecretAgentOld *                self,
-                           NMConnection *                    connection,
-                           const char *                      connection_path,
+    void (*delete_secrets)(NMSecretAgentOld                 *self,
+                           NMConnection                     *connection,
+                           const char                       *connection_path,
                            NMSecretAgentOldDeleteSecretsFunc callback,
                            gpointer                          user_data);
 
@@ -208,8 +208,8 @@ gboolean nm_secret_agent_old_get_registered(NMSecretAgentOld *self);
 NM_AVAILABLE_IN_1_24
 void nm_secret_agent_old_enable(NMSecretAgentOld *self, gboolean enable);
 
-void nm_secret_agent_old_register_async(NMSecretAgentOld *  self,
-                                        GCancellable *      cancellable,
+void nm_secret_agent_old_register_async(NMSecretAgentOld   *self,
+                                        GCancellable       *cancellable,
                                         GAsyncReadyCallback callback,
                                         gpointer            user_data);
 gboolean
@@ -229,8 +229,8 @@ gboolean
 nm_secret_agent_old_unregister(NMSecretAgentOld *self, GCancellable *cancellable, GError **error);
 
 NM_DEPRECATED_IN_1_24_FOR(nm_secret_agent_old_enable)
-void nm_secret_agent_old_unregister_async(NMSecretAgentOld *  self,
-                                          GCancellable *      cancellable,
+void nm_secret_agent_old_unregister_async(NMSecretAgentOld   *self,
+                                          GCancellable       *cancellable,
                                           GAsyncReadyCallback callback,
                                           gpointer            user_data);
 
@@ -240,21 +240,21 @@ nm_secret_agent_old_unregister_finish(NMSecretAgentOld *self, GAsyncResult *resu
 
 /*****************************************************************************/
 
-void nm_secret_agent_old_get_secrets(NMSecretAgentOld *             self,
-                                     NMConnection *                 connection,
-                                     const char *                   setting_name,
-                                     const char **                  hints,
+void nm_secret_agent_old_get_secrets(NMSecretAgentOld              *self,
+                                     NMConnection                  *connection,
+                                     const char                    *setting_name,
+                                     const char                   **hints,
                                      NMSecretAgentGetSecretsFlags   flags,
                                      NMSecretAgentOldGetSecretsFunc callback,
                                      gpointer                       user_data);
 
-void nm_secret_agent_old_save_secrets(NMSecretAgentOld *              self,
-                                      NMConnection *                  connection,
+void nm_secret_agent_old_save_secrets(NMSecretAgentOld               *self,
+                                      NMConnection                   *connection,
                                       NMSecretAgentOldSaveSecretsFunc callback,
                                       gpointer                        user_data);
 
-void nm_secret_agent_old_delete_secrets(NMSecretAgentOld *                self,
-                                        NMConnection *                    connection,
+void nm_secret_agent_old_delete_secrets(NMSecretAgentOld                 *self,
+                                        NMConnection                     *connection,
                                         NMSecretAgentOldDeleteSecretsFunc callback,
                                         gpointer                          user_data);
 
diff --git a/src/libnm-client-public/nm-vpn-connection.h b/src/libnm-client-public/nm-vpn-connection.h
index 1a20d0af..33ca139d 100644
--- a/src/libnm-client-public/nm-vpn-connection.h
+++ b/src/libnm-client-public/nm-vpn-connection.h
@@ -37,7 +37,7 @@ typedef struct _NMVpnConnectionClass NMVpnConnectionClass;
 GType nm_vpn_connection_get_type(void);
 
 NMVpnConnectionState nm_vpn_connection_get_vpn_state(NMVpnConnection *vpn);
-const char *         nm_vpn_connection_get_banner(NMVpnConnection *vpn);
+const char          *nm_vpn_connection_get_banner(NMVpnConnection *vpn);
 
 G_END_DECLS
 
diff --git a/src/libnm-client-public/nm-vpn-plugin-old.h b/src/libnm-client-public/nm-vpn-plugin-old.h
index 116b8b90..7704c153 100644
--- a/src/libnm-client-public/nm-vpn-plugin-old.h
+++ b/src/libnm-client-public/nm-vpn-plugin-old.h
@@ -66,9 +66,9 @@ typedef struct {
 
     NM_DEPRECATED_IN_1_2
     gboolean (*need_secrets)(NMVpnPluginOld *plugin,
-                             NMConnection *  connection,
-                             const char **   setting_name,
-                             GError **       error);
+                             NMConnection   *connection,
+                             const char    **setting_name,
+                             GError        **error);
 
     NM_DEPRECATED_IN_1_2
     gboolean (*disconnect)(NMVpnPluginOld *plugin, GError **err);
@@ -78,9 +78,9 @@ typedef struct {
 
     NM_DEPRECATED_IN_1_2
     gboolean (*connect_interactive)(NMVpnPluginOld *plugin,
-                                    NMConnection *  connection,
-                                    GVariant *      details,
-                                    GError **       error);
+                                    NMConnection   *connection,
+                                    GVariant       *details,
+                                    GError        **error);
 
     /*< private >*/
     NM_DEPRECATED_IN_1_2
@@ -126,8 +126,8 @@ gboolean
 nm_vpn_plugin_old_read_vpn_details(int fd, GHashTable **out_data, GHashTable **out_secrets);
 
 NM_DEPRECATED_IN_1_2
-gboolean nm_vpn_plugin_old_get_secret_flags(GHashTable *          data,
-                                            const char *          secret_name,
+gboolean nm_vpn_plugin_old_get_secret_flags(GHashTable           *data,
+                                            const char           *secret_name,
                                             NMSettingSecretFlags *out_flags);
 
 G_END_DECLS
diff --git a/src/libnm-client-public/nm-vpn-service-plugin.h b/src/libnm-client-public/nm-vpn-service-plugin.h
index 916ea52a..81fb6730 100644
--- a/src/libnm-client-public/nm-vpn-service-plugin.h
+++ b/src/libnm-client-public/nm-vpn-service-plugin.h
@@ -73,9 +73,9 @@ typedef struct {
 
     NM_AVAILABLE_IN_1_2
     gboolean (*need_secrets)(NMVpnServicePlugin *plugin,
-                             NMConnection *      connection,
-                             const char **       setting_name,
-                             GError **           error);
+                             NMConnection       *connection,
+                             const char        **setting_name,
+                             GError            **error);
 
     NM_AVAILABLE_IN_1_2
     gboolean (*disconnect)(NMVpnServicePlugin *plugin, GError **err);
@@ -85,9 +85,9 @@ typedef struct {
 
     NM_AVAILABLE_IN_1_2
     gboolean (*connect_interactive)(NMVpnServicePlugin *plugin,
-                                    NMConnection *      connection,
-                                    GVariant *          details,
-                                    GError **           error);
+                                    NMConnection       *connection,
+                                    GVariant           *details,
+                                    GError            **error);
 
     /*< private >*/
     NM_AVAILABLE_IN_1_2
@@ -102,8 +102,8 @@ GDBusConnection *nm_vpn_service_plugin_get_connection(NMVpnServicePlugin *plugin
 
 NM_AVAILABLE_IN_1_2
 void nm_vpn_service_plugin_secrets_required(NMVpnServicePlugin *plugin,
-                                            const char *        message,
-                                            const char **       hints);
+                                            const char         *message,
+                                            const char        **hints);
 
 NM_AVAILABLE_IN_1_2
 void nm_vpn_service_plugin_set_login_banner(NMVpnServicePlugin *plugin, const char *banner);
@@ -133,8 +133,8 @@ gboolean
 nm_vpn_service_plugin_read_vpn_details(int fd, GHashTable **out_data, GHashTable **out_secrets);
 
 NM_AVAILABLE_IN_1_2
-gboolean nm_vpn_service_plugin_get_secret_flags(GHashTable *          data,
-                                                const char *          secret_name,
+gboolean nm_vpn_service_plugin_get_secret_flags(GHashTable           *data,
+                                                const char           *secret_name,
                                                 NMSettingSecretFlags *out_flags);
 
 G_END_DECLS