format: replace tabs for indentation in code commentsac/clang-format

sed -i \
     -e 's/^'$'\t'' \*/     */g' \
     -e 's/^'$'\t\t'' \*/         */g' \
     -e 's/^'$'\t\t\t'' \*/             */g' \
     -e 's/^'$'\t\t\t\t'' \*/                 */g' \
     -e 's/^'$'\t\t\t\t\t'' \*/                     */g' \
     -e 's/^'$'\t\t\t\t\t\t'' \*/                         */g' \
     -e 's/^'$'\t\t\t\t\t\t\t'' \*/                             */g' \
     $(git ls-files -- '*.[hc]')

46 files changed, 1879 insertions, 1879 deletions

diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 93ceb7c830..deaf5d0810 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -503,10 +503,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMAccessPoint:flags:
-	 *
-	 * The flags of the access point.
-	 **/
+     * NMAccessPoint:flags:
+     *
+     * The flags of the access point.
+     **/
     obj_properties[PROP_FLAGS] = g_param_spec_flags(NM_ACCESS_POINT_FLAGS,
                                                     "",
                                                     "",
@@ -515,10 +515,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:wpa-flags:
-	 *
-	 * The WPA flags of the access point.
-	 **/
+     * NMAccessPoint:wpa-flags:
+     *
+     * The WPA flags of the access point.
+     **/
     obj_properties[PROP_WPA_FLAGS] = g_param_spec_flags(NM_ACCESS_POINT_WPA_FLAGS,
                                                         "",
                                                         "",
@@ -527,10 +527,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:rsn-flags:
-	 *
-	 * The RSN flags of the access point.
-	 **/
+     * NMAccessPoint:rsn-flags:
+     *
+     * The RSN flags of the access point.
+     **/
     obj_properties[PROP_RSN_FLAGS] = g_param_spec_flags(NM_ACCESS_POINT_RSN_FLAGS,
                                                         "",
                                                         "",
@@ -539,10 +539,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:ssid:
-	 *
-	 * The SSID of the access point, or %NULL if it is not known.
-	 **/
+     * NMAccessPoint:ssid:
+     *
+     * The SSID of the access point, or %NULL if it is not known.
+     **/
     obj_properties[PROP_SSID] = g_param_spec_boxed(NM_ACCESS_POINT_SSID,
                                                    "",
                                                    "",
@@ -550,10 +550,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:frequency:
-	 *
-	 * The frequency of the access point.
-	 **/
+     * NMAccessPoint:frequency:
+     *
+     * The frequency of the access point.
+     **/
     obj_properties[PROP_FREQUENCY] = g_param_spec_uint(NM_ACCESS_POINT_FREQUENCY,
                                                        "",
                                                        "",
@@ -563,10 +563,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:bssid:
-	 *
-	 * The BSSID of the access point.
-	 **/
+     * NMAccessPoint:bssid:
+     *
+     * The BSSID of the access point.
+     **/
     obj_properties[PROP_BSSID] = g_param_spec_string(NM_ACCESS_POINT_BSSID,
                                                      "",
                                                      "",
@@ -574,12 +574,12 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:hw-address:
-	 *
-	 * Alias for #NMAccessPoint:bssid.
-	 *
-	 * Deprecated: 1.0: Use #NMAccessPoint:bssid.
-	 **/
+     * NMAccessPoint:hw-address:
+     *
+     * Alias for #NMAccessPoint:bssid.
+     *
+     * Deprecated: 1.0: Use #NMAccessPoint:bssid.
+     **/
     obj_properties[PROP_HW_ADDRESS] =
         g_param_spec_string(NM_ACCESS_POINT_HW_ADDRESS,
                             "",
@@ -588,12 +588,12 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:mode:
-	 *
-	 * The mode of the access point; either "infrastructure" (a central
-	 * coordinator of the wireless network allowing clients to connect) or
-	 * "ad-hoc" (a network with no central controller).
-	 **/
+     * NMAccessPoint:mode:
+     *
+     * The mode of the access point; either "infrastructure" (a central
+     * coordinator of the wireless network allowing clients to connect) or
+     * "ad-hoc" (a network with no central controller).
+     **/
     obj_properties[PROP_MODE] = g_param_spec_enum(NM_ACCESS_POINT_MODE,
                                                   "",
                                                   "",
@@ -602,10 +602,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:max-bitrate:
-	 *
-	 * The maximum bit rate of the access point in kbit/s.
-	 **/
+     * NMAccessPoint:max-bitrate:
+     *
+     * The maximum bit rate of the access point in kbit/s.
+     **/
     obj_properties[PROP_MAX_BITRATE] = g_param_spec_uint(NM_ACCESS_POINT_MAX_BITRATE,
                                                          "",
                                                          "",
@@ -615,10 +615,10 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:strength:
-	 *
-	 * The current signal strength of the access point.
-	 **/
+     * NMAccessPoint:strength:
+     *
+     * The current signal strength of the access point.
+     **/
     obj_properties[PROP_STRENGTH] = g_param_spec_uchar(NM_ACCESS_POINT_STRENGTH,
                                                        "",
                                                        "",
@@ -628,14 +628,14 @@ nm_access_point_class_init(NMAccessPointClass *ap_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMAccessPoint:last-seen:
-	 *
-	 * The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
-	 * access point was found in scan results.  A value of -1 means the
-	 * access point has not been found in a scan.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMAccessPoint:last-seen:
+     *
+     * The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
+     * access point was found in scan results.  A value of -1 means the
+     * access point has not been found in a scan.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_LAST_SEEN] = g_param_spec_int(NM_ACCESS_POINT_LAST_SEEN,
                                                       "",
                                                       "",
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 6efa5163fd..906db0615c 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -400,8 +400,8 @@ _notify_event_state_changed(NMClient *client, NMClientNotifyEventWithPtr *notify
     NMActiveConnectionPrivate *         priv = NM_ACTIVE_CONNECTION_GET_PRIVATE(self);
 
     /* we expose here the value cache in @priv. In practice, this is the same
-	 * value as we received from the signal. In the unexpected case where they
-	 * differ, the cached value of the current instance would still be more correct. */
+     * value as we received from the signal. In the unexpected case where they
+     * differ, the cached value of the current instance would still be more correct. */
     g_signal_emit(self, signals[STATE_CHANGED], 0, (guint) priv->state, (guint) priv->reason);
 }
 
@@ -433,20 +433,20 @@ is_ready(NMObject *nmobj)
     NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE(nmobj);
 
     /* Usually, we don't want to expose our NMObject instances until they are fully initialized.
-	 * For NMRemoteSetting this means to wait until GetSettings() returns.
-	 *
-	 * Note that most object types reference each other (directly or indirectly). E.g. the
-	 * NMActiveConnection refers to the NMRemoteConnection and the NMDevice instance. So,
-	 * we don't want to hide them too long, otherwise basically the entire set of objects
-	 * will be hidden until they are all initialized. So, usually, when a NMObject references
-	 * objects that are not yet initialized, that reference will just be NULL but the object
-	 * will be considered ready already.
-	 *
-	 * For NMActiveConnection referencing a NMRemoteConnection don't do that. Here we wait for the
-	 * NMRemoteConnection to be ready as well. This is somewhat arbitrary special casing, but
-	 * the effect is that when nm_client_add_and_activate*() returns, the NMActiveConnection already
-	 * references a initialized NMRemoteConnection.
-	 */
+     * For NMRemoteSetting this means to wait until GetSettings() returns.
+     *
+     * Note that most object types reference each other (directly or indirectly). E.g. the
+     * NMActiveConnection refers to the NMRemoteConnection and the NMDevice instance. So,
+     * we don't want to hide them too long, otherwise basically the entire set of objects
+     * will be hidden until they are all initialized. So, usually, when a NMObject references
+     * objects that are not yet initialized, that reference will just be NULL but the object
+     * will be considered ready already.
+     *
+     * For NMActiveConnection referencing a NMRemoteConnection don't do that. Here we wait for the
+     * NMRemoteConnection to be ready as well. This is somewhat arbitrary special casing, but
+     * the effect is that when nm_client_add_and_activate*() returns, the NMActiveConnection already
+     * references a initialized NMRemoteConnection.
+     */
     if (!nml_dbus_property_o_is_ready_fully(&priv->property_o[PROPERTY_O_IDX_CONNECTION]))
         return FALSE;
 
@@ -623,10 +623,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
     _NM_OBJECT_CLASS_INIT_PROPERTY_AO_FIELDS_1(nm_object_class, NMActiveConnectionPrivate, devices);
 
     /**
-	 * NMActiveConnection:connection:
-	 *
-	 * The connection that this is an active instance of.
-	 **/
+     * NMActiveConnection:connection:
+     *
+     * The connection that this is an active instance of.
+     **/
     obj_properties[PROP_CONNECTION] =
         g_param_spec_object(NM_ACTIVE_CONNECTION_CONNECTION,
                             "",
@@ -635,10 +635,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:id:
-	 *
-	 * The active connection's ID
-	 **/
+     * NMActiveConnection:id:
+     *
+     * The active connection's ID
+     **/
     obj_properties[PROP_ID] = g_param_spec_string(NM_ACTIVE_CONNECTION_ID,
                                                   "",
                                                   "",
@@ -646,10 +646,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:uuid:
-	 *
-	 * The active connection's UUID
-	 **/
+     * NMActiveConnection:uuid:
+     *
+     * The active connection's UUID
+     **/
     obj_properties[PROP_UUID] = g_param_spec_string(NM_ACTIVE_CONNECTION_UUID,
                                                     "",
                                                     "",
@@ -657,10 +657,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:type:
-	 *
-	 * The active connection's type
-	 **/
+     * NMActiveConnection:type:
+     *
+     * The active connection's type
+     **/
     obj_properties[PROP_TYPE] = g_param_spec_string(NM_ACTIVE_CONNECTION_TYPE,
                                                     "",
                                                     "",
@@ -668,11 +668,11 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:specific-object-path:
-	 *
-	 * The path to the "specific object" of the active connection; see
-	 * nm_active_connection_get_specific_object_path() for more details.
-	 **/
+     * NMActiveConnection:specific-object-path:
+     *
+     * The path to the "specific object" of the active connection; see
+     * nm_active_connection_get_specific_object_path() for more details.
+     **/
     obj_properties[PROP_SPECIFIC_OBJECT_PATH] =
         g_param_spec_string(NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT_PATH,
                             "",
@@ -681,10 +681,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:devices: (type GPtrArray(NMDevice))
-	 *
-	 * The devices of the active connection.
-	 **/
+     * NMActiveConnection:devices: (type GPtrArray(NMDevice))
+     *
+     * The devices of the active connection.
+     **/
     obj_properties[PROP_DEVICES] = g_param_spec_boxed(NM_ACTIVE_CONNECTION_DEVICES,
                                                       "",
                                                       "",
@@ -692,10 +692,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:state:
-	 *
-	 * The state of the active connection.
-	 **/
+     * NMActiveConnection:state:
+     *
+     * The state of the active connection.
+     **/
     obj_properties[PROP_STATE] = g_param_spec_enum(NM_ACTIVE_CONNECTION_STATE,
                                                    "",
                                                    "",
@@ -704,12 +704,12 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:state-flags:
-	 *
-	 * The state flags of the active connection.
-	 *
-	 * Since: 1.10
-	 **/
+     * NMActiveConnection:state-flags:
+     *
+     * The state flags of the active connection.
+     *
+     * Since: 1.10
+     **/
     obj_properties[PROP_STATE_FLAGS] = g_param_spec_uint(NM_ACTIVE_CONNECTION_STATE_FLAGS,
                                                          "",
                                                          "",
@@ -719,10 +719,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:default:
-	 *
-	 * Whether the active connection is the default IPv4 one.
-	 **/
+     * NMActiveConnection:default:
+     *
+     * Whether the active connection is the default IPv4 one.
+     **/
     obj_properties[PROP_DEFAULT] = g_param_spec_boolean(NM_ACTIVE_CONNECTION_DEFAULT,
                                                         "",
                                                         "",
@@ -730,10 +730,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:ip4-config:
-	 *
-	 * The IPv4 #NMIPConfig of the connection.
-	 **/
+     * NMActiveConnection:ip4-config:
+     *
+     * The IPv4 #NMIPConfig of the connection.
+     **/
     obj_properties[PROP_IP4_CONFIG] =
         g_param_spec_object(NM_ACTIVE_CONNECTION_IP4_CONFIG,
                             "",
@@ -742,10 +742,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:dhcp4-config:
-	 *
-	 * The IPv4 #NMDhcpConfig of the connection.
-	 **/
+     * NMActiveConnection:dhcp4-config:
+     *
+     * The IPv4 #NMDhcpConfig of the connection.
+     **/
     obj_properties[PROP_DHCP4_CONFIG] =
         g_param_spec_object(NM_ACTIVE_CONNECTION_DHCP4_CONFIG,
                             "",
@@ -754,10 +754,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:default6:
-	 *
-	 * Whether the active connection is the default IPv6 one.
-	 **/
+     * NMActiveConnection:default6:
+     *
+     * Whether the active connection is the default IPv6 one.
+     **/
     obj_properties[PROP_DEFAULT6] = g_param_spec_boolean(NM_ACTIVE_CONNECTION_DEFAULT6,
                                                          "",
                                                          "",
@@ -765,10 +765,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:ip6-config:
-	 *
-	 * The IPv6 #NMIPConfig of the connection.
-	 **/
+     * NMActiveConnection:ip6-config:
+     *
+     * The IPv6 #NMIPConfig of the connection.
+     **/
     obj_properties[PROP_IP6_CONFIG] =
         g_param_spec_object(NM_ACTIVE_CONNECTION_IP6_CONFIG,
                             "",
@@ -777,10 +777,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:dhcp6-config:
-	 *
-	 * The IPv6 #NMDhcpConfig of the connection.
-	 **/
+     * NMActiveConnection:dhcp6-config:
+     *
+     * The IPv6 #NMDhcpConfig of the connection.
+     **/
     obj_properties[PROP_DHCP6_CONFIG] =
         g_param_spec_object(NM_ACTIVE_CONNECTION_DHCP6_CONFIG,
                             "",
@@ -789,10 +789,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:vpn:
-	 *
-	 * Whether the active connection is a VPN connection.
-	 **/
+     * NMActiveConnection:vpn:
+     *
+     * Whether the active connection is a VPN connection.
+     **/
     obj_properties[PROP_VPN] = g_param_spec_boolean(NM_ACTIVE_CONNECTION_VPN,
                                                     "",
                                                     "",
@@ -800,10 +800,10 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMActiveConnection:master:
-	 *
-	 * The master device if one exists.
-	 **/
+     * NMActiveConnection:master:
+     *
+     * The master device if one exists.
+     **/
     obj_properties[PROP_MASTER] = g_param_spec_object(NM_ACTIVE_CONNECTION_MASTER,
                                                       "",
                                                       "",
@@ -814,17 +814,17 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
                                               &_nml_dbus_meta_iface_nm_connection_active);
 
     /* TODO: the state reason should also be exposed as a property in libnm's NMActiveConnection,
-	 * like done for NMDevice's state reason. */
+     * like done for NMDevice's state reason. */
 
     /* TODO: the D-Bus API should also expose the state-reason as a property instead of
-	 * a "StateChanged" signal. Like done for Device's "StateReason".  */
+     * a "StateChanged" signal. Like done for Device's "StateReason".  */
 
     /**
-	 * NMActiveConnection::state-changed:
-	 * @active_connection: the source #NMActiveConnection
-	 * @state: the new state number (#NMActiveConnectionState)
-	 * @reason: the state change reason (#NMActiveConnectionStateReason)
-	 */
+     * NMActiveConnection::state-changed:
+     * @active_connection: the source #NMActiveConnection
+     * @state: the new state number (#NMActiveConnectionState)
+     * @reason: the state change reason (#NMActiveConnectionStateReason)
+     */
     signals[STATE_CHANGED] = g_signal_new("state-changed",
                                           G_OBJECT_CLASS_TYPE(object_class),
                                           G_SIGNAL_RUN_FIRST,
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index 6c1d96d63b..6876e16f9d 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -155,12 +155,12 @@ nm_checkpoint_class_init(NMCheckpointClass *klass)
     _NM_OBJECT_CLASS_INIT_PROPERTY_AO_FIELDS_1(nm_object_class, NMCheckpointPrivate, devices);
 
     /**
-	 * NMCheckpoint:devices: (type GPtrArray(NMDevice))
-	 *
-	 * The devices that are part of this checkpoint.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMCheckpoint:devices: (type GPtrArray(NMDevice))
+     *
+     * The devices that are part of this checkpoint.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_DEVICES] = g_param_spec_boxed(NM_CHECKPOINT_DEVICES,
                                                       "",
                                                       "",
@@ -168,12 +168,12 @@ nm_checkpoint_class_init(NMCheckpointClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMCheckpoint:created:
-	 *
-	 * The timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMCheckpoint:created:
+     *
+     * The timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_CREATED] = g_param_spec_int64(NM_CHECKPOINT_CREATED,
                                                       "",
                                                       "",
@@ -183,12 +183,12 @@ nm_checkpoint_class_init(NMCheckpointClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMCheckpoint:rollback-timeout:
-	 *
-	 * Timeout in seconds for automatic rollback, or zero.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMCheckpoint:rollback-timeout:
+     *
+     * Timeout in seconds for automatic rollback, or zero.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_ROLLBACK_TIMEOUT] =
         g_param_spec_uint(NM_CHECKPOINT_ROLLBACK_TIMEOUT,
                           "",
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 46f667378e..0d4f2a9a48 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -84,43 +84,43 @@ nm_context_busy_watcher_integrate_source(GMainContext *outer_context,
     g_source_attach(source, outer_context);
 
     /* The problem is...
-	 *
-	 * NMClient is associated with a GMainContext, just like its underlying GDBusConnection
-	 * also queues signals and callbacks on that main context. During operation, NMClient
-	 * will schedule async operations which will return asynchronously on the GMainContext.
-	 *
-	 * Note that depending on whether NMClient got initialized synchronously or asynchronously,
-	 * it has an internal priv->dbus_context that is different from the outer priv->main_context.
-	 * However, the problem is in both cases.
-	 *
-	 * So, as long as there are pending D-Bus calls, the GMainContext is referenced and kept alive.
-	 * When NMClient gets destroyed, the pending calls get cancelled, but the async callback are still
-	 * scheduled to return.
-	 * That means, the main context stays alive until it gets iterated long enough so that all pending
-	 * operations are completed.
-	 *
-	 * Note that pending operations don't keep NMClient alive, so NMClient can already be gone by
-	 * then, but the user still should iterate the main context long enough to process the (cancelled)
-	 * callbacks... at least, if the user cares about whether the remaining memory and file descriptors
-	 * of the GMainContext can be reclaimed.
-	 *
-	 * In hindsight, maybe pending references should kept NMClient alive. But then NMClient would
-	 * need a special "shutdown()" API that the user must invoke, because unrefing would no longer
-	 * be enough to ensure a shutdown (imagine a situation where NMClient receives a constant flow
-	 * of "CheckPermissions" signals, which keeps retriggering an async request). Anyway, we cannot
-	 * add such a shutdown API now, as it would break client's expectations that they can just unref
-	 * the NMClient to destroy it.
-	 *
-	 * So, we allow NMClient to unref, but the user is advised to keep iterating the main context.
-	 * But for how long? Here comes nm_client_get_context_busy_watcher() into play. The user may
-	 * subscribe a weak pointer to that instance and should keep iterating as long as the object
-	 * exists.
-	 *
-	 * Now, back to synchronous initialization. Here we have the internal priv->dbus_context context.
-	 * We also cannot remove that context right away, instead we need to keep it integrated in the
-	 * caller's priv->main_context as long as we have pending calls: that is, as long as the
-	 * context-busy-watcher is alive.
-	 */
+     *
+     * NMClient is associated with a GMainContext, just like its underlying GDBusConnection
+     * also queues signals and callbacks on that main context. During operation, NMClient
+     * will schedule async operations which will return asynchronously on the GMainContext.
+     *
+     * Note that depending on whether NMClient got initialized synchronously or asynchronously,
+     * it has an internal priv->dbus_context that is different from the outer priv->main_context.
+     * However, the problem is in both cases.
+     *
+     * So, as long as there are pending D-Bus calls, the GMainContext is referenced and kept alive.
+     * When NMClient gets destroyed, the pending calls get cancelled, but the async callback are still
+     * scheduled to return.
+     * That means, the main context stays alive until it gets iterated long enough so that all pending
+     * operations are completed.
+     *
+     * Note that pending operations don't keep NMClient alive, so NMClient can already be gone by
+     * then, but the user still should iterate the main context long enough to process the (cancelled)
+     * callbacks... at least, if the user cares about whether the remaining memory and file descriptors
+     * of the GMainContext can be reclaimed.
+     *
+     * In hindsight, maybe pending references should kept NMClient alive. But then NMClient would
+     * need a special "shutdown()" API that the user must invoke, because unrefing would no longer
+     * be enough to ensure a shutdown (imagine a situation where NMClient receives a constant flow
+     * of "CheckPermissions" signals, which keeps retriggering an async request). Anyway, we cannot
+     * add such a shutdown API now, as it would break client's expectations that they can just unref
+     * the NMClient to destroy it.
+     *
+     * So, we allow NMClient to unref, but the user is advised to keep iterating the main context.
+     * But for how long? Here comes nm_client_get_context_busy_watcher() into play. The user may
+     * subscribe a weak pointer to that instance and should keep iterating as long as the object
+     * exists.
+     *
+     * Now, back to synchronous initialization. Here we have the internal priv->dbus_context context.
+     * We also cannot remove that context right away, instead we need to keep it integrated in the
+     * caller's priv->main_context as long as we have pending calls: that is, as long as the
+     * context-busy-watcher is alive.
+     */
 
     g_object_weak_ref(context_busy_watcher,
                       _context_busy_watcher_attach_integration_source_cb,
@@ -131,7 +131,7 @@ nm_context_busy_watcher_integrate_source(GMainContext *outer_context,
 
 typedef struct {
     /* It is quite wasteful to require 2 pointers per property (of an instance) only to track whether
-	 * the property got changed. But it's convenient! */
+     * the property got changed. But it's convenient! */
     CList changed_prop_lst;
 
     GVariant *prop_data_value;
@@ -147,9 +147,9 @@ typedef struct {
     CList changed_prop_lst_head;
 
     /* We also keep track of non-well known interfaces. The presence of a D-Bus interface
-	 * is what makes a D-Bus alive or not. As we should track all D-Bus objects, we also
-	 * need to track whether there are any interfaces on it -- even if we otherwise don't
-	 * care about the interface. */
+     * is what makes a D-Bus alive or not. As we should track all D-Bus objects, we also
+     * need to track whether there are any interfaces on it -- even if we otherwise don't
+     * care about the interface. */
     bool dbus_iface_is_wellknown : 1;
 
     /* if TRUE, the interface is about to be removed. */
@@ -738,7 +738,7 @@ _nm_client_set_property_sync_legacy(NMClient *  self,
     nm_assert(val);
 
     /* A synchronous D-Bus call that is not cancellable an ignores the return value.
-	 * This function only exists for backward compatibility. */
+     * This function only exists for backward compatibility. */
     ret = g_dbus_connection_call_sync(priv->dbus_connection,
                                       priv->name_owner,
                                       object_path,
@@ -797,7 +797,7 @@ _nm_client_queue_notify_object(NMClient *self, gpointer nmobj, const GParamSpec
 
     if (base->is_disposing) {
         /* Don't emit property changed signals once the NMClient
-		 * instance is about to shut down. */
+         * instance is about to shut down. */
         nm_assert(nmobj == self);
         return;
     }
@@ -1182,9 +1182,9 @@ nml_dbus_object_iface_data_get(NMLDBusObject *dbobj,
 
     if (count > 20) {
         /* We track the list of interfaces that an object has in a linked list.
-		 * That is efficient and convenient, if we assume that each object only has a small
-		 * number of interfaces (which very much should be the case). Here, something is very
-		 * odd, maybe there is a bug or the server side is misbehaving. Anyway, error out. */
+         * That is efficient and convenient, if we assume that each object only has a small
+         * number of interfaces (which very much should be the case). Here, something is very
+         * odd, maybe there is a bug or the server side is misbehaving. Anyway, error out. */
         return NULL;
     }
 
@@ -1208,7 +1208,7 @@ nml_dbus_object_iface_data_get(NMLDBusObject *dbobj,
         c_list_link_front(&dbobj->iface_lst_head, &db_iface_data->iface_lst);
     } else {
         /* Intentionally don't initialize the other fields. We are not supposed
-		 * to touch them, and a valgrind warning would be preferable. */
+         * to touch them, and a valgrind warning would be preferable. */
         db_iface_data->dbus_iface.name         = nm_ref_string_new(dbus_iface_name);
         db_iface_data->dbus_iface_is_wellknown = FALSE;
         db_iface_data->iface_removed           = FALSE;
@@ -1336,17 +1336,17 @@ nml_dbus_object_obj_changed_link(NMClient *            self,
         NMClientPrivate *priv;
 
         /* We set the changed-type flag. Need to queue the object in the
-		 * changed list. */
+         * changed list. */
         nm_assert(c_list_is_empty(&dbobj->obj_changed_lst));
         priv = NM_CLIENT_GET_PRIVATE(self);
         c_list_link_tail(&priv->obj_changed_lst_head, &dbobj->obj_changed_lst);
     } else {
         /* The object has changes flags and must be linked already. Note that
-		 * this may be priv->obj_changed_lst_head, or a temporary list on the
-		 * stack.
-		 *
-		 * This dance with the temporary list is done to ensure we can enqueue
-		 * objects while we process the changes. */
+         * this may be priv->obj_changed_lst_head, or a temporary list on the
+         * stack.
+         *
+         * This dance with the temporary list is done to ensure we can enqueue
+         * objects while we process the changes. */
         nm_assert(!c_list_is_empty(&dbobj->obj_changed_lst));
     }
 
@@ -1558,9 +1558,9 @@ _dbobjs_obj_watcher_register_o(NMClient *               self,
     obj_watcher->_priv.notify_fcn = notify_fcn;
 
     /* we must enqueue the item in the front of the list. That is, because while
-	 * invoking notify_fcn(), we iterate the watchers front-to-end. As we want to
-	 * allow the callee to register new watches and unregister itself, this is
-	 * the right way to do it. */
+     * invoking notify_fcn(), we iterate the watchers front-to-end. As we want to
+     * allow the callee to register new watches and unregister itself, this is
+     * the right way to do it. */
     c_list_link_front(&dbobj->watcher_lst_head, &obj_watcher->_priv.watcher_lst);
 
     return obj_watcher;
@@ -2171,16 +2171,16 @@ nml_dbus_property_ao_notify(NMClient *              self,
 
             if (pr_ao_data) {
                 /* With this implementation we cannot track the same path multiple times.
-				 * Of course, for none of the properties where we use this, the server
-				 * should expose the same path more than once, so this limitation is fine
-				 * (maybe even preferable to drop duplicates form NMClient's API). */
+                 * Of course, for none of the properties where we use this, the server
+                 * should expose the same path more than once, so this limitation is fine
+                 * (maybe even preferable to drop duplicates form NMClient's API). */
                 nm_assert(pr_ao_data->obj_watcher.dbobj->dbus_path == dbus_path_r);
                 if (!changed_prop && pr_ao_data->is_notified) {
                     /* The order of a notified entry changed. That means, we need to signal
-					 * a change of the property. This detection of a change is not always
-					 * correct, in particular we might detect some changes when there were
-					 * none. That's not a serious problem, and fixing it would be expensive
-					 * to implement. */
+                     * a change of the property. This detection of a change is not always
+                     * correct, in particular we might detect some changes when there were
+                     * none. That's not a serious problem, and fixing it would be expensive
+                     * to implement. */
                     changed_prop = (c_list_first(&stale_lst_head) != &pr_ao_data->data_lst);
                 }
                 nm_c_list_move_tail(&pr_ao->data_lst_head, &pr_ao_data->data_lst);
@@ -2588,9 +2588,9 @@ _obj_handle_dbus_iface_changes(NMClient *           self,
 
     if (!type_compatible) {
         /* on D-Bus, we have this interface associate with the object, but apparently
-		 * it is not compatible. This is either a bug, or NetworkManager exposed an
-		 * unexpected interface on D-Bus object for which we create a certain NMObject
-		 * type. */
+         * it is not compatible. This is either a bug, or NetworkManager exposed an
+         * unexpected interface on D-Bus object for which we create a certain NMObject
+         * type. */
         return;
     }
 
@@ -2619,12 +2619,12 @@ _obj_handle_dbus_iface_changes(NMClient *           self,
             nm_assert(db_prop_data->prop_data_value);
 
             /* Currently, NMLDBusObject forgets about the variant. Theoretically, it could cache
-			 * it, but there is no need because we update the property in nmobj (which extracts and
-			 * keeps the property value itself).
-			 *
-			 * Note that we only consume the variant here when we process it.
-			 * That implies that we already created a NMObject for the dbobj
-			 * instance. Unless that happens, we cache the last seen property values. */
+             * it, but there is no need because we update the property in nmobj (which extracts and
+             * keeps the property value itself).
+             *
+             * Note that we only consume the variant here when we process it.
+             * That implies that we already created a NMObject for the dbobj
+             * instance. Unless that happens, we cache the last seen property values. */
             prop_data_value = g_steal_pointer(&db_prop_data->prop_data_value);
 
             i_prop = (db_prop_data - &db_iface_data->prop_datas[0]);
@@ -2644,14 +2644,14 @@ _obj_handle_dbus_changes(NMClient *self, NMLDBusObject *dbobj)
     _ASSERT_dbobj(dbobj, self);
 
     /* In a first step we only remember all the changes that a D-Bus message brings
-	 * and queue the object to process them.
-	 *
-	 * Here (in step 2) we look at what changed on D-Bus and propagate those changes
-	 * to the NMObject instance.
-	 *
-	 * Note that here we still must not emit any GObject signals. That follows later,
-	 * and again if the object changes, we will just queue that we handle the changes
-	 * later. */
+     * and queue the object to process them.
+     *
+     * Here (in step 2) we look at what changed on D-Bus and propagate those changes
+     * to the NMObject instance.
+     *
+     * Note that here we still must not emit any GObject signals. That follows later,
+     * and again if the object changes, we will just queue that we handle the changes
+     * later. */
 
     c_list_for_each_entry_safe (db_iface_data,
                                 db_iface_data_safe,
@@ -2667,15 +2667,15 @@ _obj_handle_dbus_changes(NMClient *self, NMLDBusObject *dbobj)
 
     if (G_UNLIKELY(!dbobj->nmobj) && !c_list_is_empty(&dbobj->iface_lst_head)) {
         /* Try to create a NMObject for this D-Bus object. Note that we detect the type
-		 * based on the interfaces that it has, and if we make a choice once, we don't
-		 * change. That means, one D-Bus object can only be of one type. */
+         * based on the interfaces that it has, and if we make a choice once, we don't
+         * change. That means, one D-Bus object can only be of one type. */
 
         if (NM_IN_SET(dbobj->dbus_path,
                       _dbus_path_nm,
                       _dbus_path_settings,
                       _dbus_path_dns_manager)) {
             /* For the main types, we don't detect them based on the interfaces present,
-			 * but on the path names. Of course, both should correspond anyway. */
+             * but on the path names. Of course, both should correspond anyway. */
             NML_NMCLIENT_LOG_T(self,
                                "[%s]: register NMClient for D-Bus object",
                                dbobj->dbus_path->str);
@@ -2785,9 +2785,9 @@ _dbus_handle_obj_changed_nmobj(NMClient *self)
     nm_assert(!nml_dbus_object_obj_changed_any_linked(self, ~NML_DBUS_OBJ_CHANGED_TYPE_NMOBJ));
 
     /* First we notify all watchers that these objects changed. Note that we only do that
-	 * here for the list before processing the changes below in a loop. That is, because
-	 * processing changes can again enqueue changed objects, and we only want to want to
-	 * notify watchers for the events that happened earlier (not repeatedly notify them). */
+     * here for the list before processing the changes below in a loop. That is, because
+     * processing changes can again enqueue changed objects, and we only want to want to
+     * notify watchers for the events that happened earlier (not repeatedly notify them). */
     c_list_splice(&obj_changed_tmp_lst_head, &priv->obj_changed_lst_head);
     while (
         (dbobj = c_list_first_entry(&obj_changed_tmp_lst_head, NMLDBusObject, obj_changed_lst))) {
@@ -2846,11 +2846,11 @@ _dbus_handle_obj_changed_dbus(NMClient *self, const char *log_context)
     priv = NM_CLIENT_GET_PRIVATE(self);
 
     /* We move the changed list onto a temporary list and consume that.
-	 * Note that nml_dbus_object_obj_changed_consume() will move the object
-	 * back to the original list if there are changes of another type.
-	 *
-	 * This is done so that we can enqueue more changes while processing the
-	 * change list. */
+     * Note that nml_dbus_object_obj_changed_consume() will move the object
+     * back to the original list if there are changes of another type.
+     *
+     * This is done so that we can enqueue more changes while processing the
+     * change list. */
     c_list_splice(&obj_changed_tmp_lst_head, &priv->obj_changed_lst_head);
 
     while (
@@ -2879,7 +2879,7 @@ _dbus_handle_obj_changed_dbus(NMClient *self, const char *log_context)
     }
 
     /* D-Bus changes can only be enqueued in an earlier stage. We don't expect
-	 * anymore changes of type D-Bus at this point. */
+     * anymore changes of type D-Bus at this point. */
     nm_assert(!nml_dbus_object_obj_changed_any_linked(self, NML_DBUS_OBJ_CHANGED_TYPE_DBUS));
 }
 
@@ -3247,7 +3247,7 @@ _dbus_get_managed_objects_cb(GObject *source, GAsyncResult *result, gpointer use
     if (!managed_objects) {
         NML_NMCLIENT_LOG_D(self, "GetManagedObjects() call failed: %s", error->message);
         /* hm, now that's odd. Maybe NetworkManager just quit and we are about to get
-		 * a name-owner changed signal soon. Treat this as if we got no managed objects at all. */
+         * a name-owner changed signal soon. Treat this as if we got no managed objects at all. */
     } else
         NML_NMCLIENT_LOG_D(self, "GetManagedObjects() completed");
 
@@ -3265,7 +3265,7 @@ _dbus_get_managed_objects_cb(GObject *source, GAsyncResult *result, gpointer use
     }
 
     /* always call _dbus_handle_changes(), even if nothing changed. We need this to complete
-	 * initialization. */
+     * initialization. */
     _dbus_handle_changes(self, "get-managed-objects", TRUE);
 }
 
@@ -3524,7 +3524,7 @@ _dbus_check_permissions_start_cb(GObject *source, GAsyncResult *result, gpointer
 
     if (!ret) {
         /* when the call completes, we always pretend success. Even a failure means
-		 * that we fetched the permissions, however they are all unknown. */
+         * that we fetched the permissions, however they are all unknown. */
         NML_NMCLIENT_LOG_T(self, "GetPermissions call failed: %s", error->message);
         goto out;
     }
@@ -3895,7 +3895,7 @@ _request_wait_start(GTask *     task_take,
                                    NULL);
         if (id == 0) {
             /* the callback was invoked synchronously, which destroyed @request_data.
-			 * We must not touch @info anymore. */
+             * We must not touch @info anymore. */
         } else
             request_data->cancellable_id = id;
     }
@@ -4578,10 +4578,10 @@ nm_client_check_connectivity(NMClient *client, GCancellable *cancellable, GError
     g_variant_get(ret, "(u)", &connectivity);
 
     /* upon receiving the synchronous response, we hack the NMClient state
-	 * and update the property outside the ordered D-Bus messages (like
-	 * "PropertiesChanged" signals).
-	 *
-	 * This is really ugly, we shouldn't do this. */
+     * and update the property outside the ordered D-Bus messages (like
+     * "PropertiesChanged" signals).
+     *
+     * This is really ugly, we shouldn't do this. */
 
     priv = NM_CLIENT_GET_PRIVATE(client);
 
@@ -5636,9 +5636,9 @@ _add_connection_call(NMClient *                    self,
         settings = g_variant_new_array(G_VARIANT_TYPE("{sa{sv}}"), NULL, 0);
 
     /* Although AddConnection2() being capable to handle also AddConnection() and
-	 * AddConnectionUnsaved() variants, we prefer to use the old D-Bus methods when
-	 * they are sufficient. The reason is that libnm should avoid hard dependencies
-	 * on 1.20 API whenever possible. */
+     * AddConnectionUnsaved() variants, we prefer to use the old D-Bus methods when
+     * they are sufficient. The reason is that libnm should avoid hard dependencies
+     * on 1.20 API whenever possible. */
     if (ignore_out_result && flags == NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK) {
         _nm_client_dbus_call(self,
                              self,
@@ -6974,8 +6974,8 @@ _init_release_all(NMClient *self)
     _dbus_handle_changes(self, "release-all", FALSE);
 
     /* We require that when we remove all D-Bus interfaces, that all object will go
-	 * away. Note that a NMLDBusObject can be alive due to a NMLDBusObjWatcher, but
-	 * even those should be all cleaned up. */
+     * away. Note that a NMLDBusObject can be alive due to a NMLDBusObjWatcher, but
+     * even those should be all cleaned up. */
     nm_assert(c_list_is_empty(&priv->obj_changed_lst_head));
     nm_assert(c_list_is_empty(&priv->dbus_objects_lst_head_watched_only));
     nm_assert(c_list_is_empty(&priv->dbus_objects_lst_head_on_dbus));
@@ -7007,9 +7007,9 @@ name_owner_changed(NMClient *self, const char *name_owner)
         nm_clear_g_dbus_connection_signal(priv->dbus_connection, &priv->name_owner_changed_id);
 
         /* Our instance was initialized synchronously. Usually we must henceforth
-		 * stick to a internal main context. But now we have no name-owner...
-		 * at this point, we anyway are going to do a full resync. Swap the main
-		 * contexts again. */
+         * stick to a internal main context. But now we have no name-owner...
+         * at this point, we anyway are going to do a full resync. Swap the main
+         * contexts again. */
 
         old_context_busy_watcher   = g_steal_pointer(&priv->context_busy_watcher);
         priv->context_busy_watcher = g_object_ref(
@@ -7165,32 +7165,32 @@ nml_cleanup_context_busy_watcher_on_idle(GObject *context_busy_watcher_take, GMa
     nm_assert(context);
 
     /* Technically, we cancelled all pending actions (and these actions
-	 * (GTask) keep the context_busy_watcher object alive). Also, we passed
-	 * no destroy notify to g_dbus_connection_signal_subscribe().
-	 * That means, there should be no other unaccounted GSource'es left.
-	 *
-	 * However, we really need to be sure that the context_busy_watcher's
-	 * lifetime matches the time that the context is busy. That is especially
-	 * important with synchronous initialization, where the context-busy-watcher
-	 * keeps the inner GMainContext integrated in the caller's.
-	 * We must not g_source_destroy() that integration too early.
-	 *
-	 * So to be really sure all this is given, always schedule one last
-	 * cleanup idle action with low priority. This should be the last
-	 * thing related to this instance that keeps the context busy.
-	 *
-	 * Note that we could also *not* take a reference on @context
-	 * and unref @context_busy_watcher via the GDestroyNotify. That would
-	 * allow for the context to be wrapped up early, and when the last user
-	 * gives up the reference to the context, the destroy notify could complete
-	 * without even invoke the idle handler. However, that destroy notify may
-	 * not be called in the right thread. So, we want to be sure that we unref
-	 * the context-busy-watcher in the right context. Hence, we always take an
-	 * additional reference and always cleanup in the idle handler. This means:
-	 * the user *MUST* always keep iterating the context after NMClient got destroyed.
-	 * But that is not a severe limitation, because the user anyway must be prepared
-	 * to do that. That is because in many cases it is necessary anyway (and the user
-	 * wouldn't know a priory when not). This way, it is just always necessary. */
+     * (GTask) keep the context_busy_watcher object alive). Also, we passed
+     * no destroy notify to g_dbus_connection_signal_subscribe().
+     * That means, there should be no other unaccounted GSource'es left.
+     *
+     * However, we really need to be sure that the context_busy_watcher's
+     * lifetime matches the time that the context is busy. That is especially
+     * important with synchronous initialization, where the context-busy-watcher
+     * keeps the inner GMainContext integrated in the caller's.
+     * We must not g_source_destroy() that integration too early.
+     *
+     * So to be really sure all this is given, always schedule one last
+     * cleanup idle action with low priority. This should be the last
+     * thing related to this instance that keeps the context busy.
+     *
+     * Note that we could also *not* take a reference on @context
+     * and unref @context_busy_watcher via the GDestroyNotify. That would
+     * allow for the context to be wrapped up early, and when the last user
+     * gives up the reference to the context, the destroy notify could complete
+     * without even invoke the idle handler. However, that destroy notify may
+     * not be called in the right thread. So, we want to be sure that we unref
+     * the context-busy-watcher in the right context. Hence, we always take an
+     * additional reference and always cleanup in the idle handler. This means:
+     * the user *MUST* always keep iterating the context after NMClient got destroyed.
+     * But that is not a severe limitation, because the user anyway must be prepared
+     * to do that. That is because in many cases it is necessary anyway (and the user
+     * wouldn't know a priory when not). This way, it is just always necessary. */
 
     cleanup_source =
         nm_g_idle_source_new(G_PRIORITY_LOW + 10,
@@ -7511,7 +7511,7 @@ set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *ps
             NMClientInstanceFlags flags = v_uint;
 
             /* After object construction, we only allow to toggle certain flags and
-			 * ignore all other flags. */
+             * ignore all other flags. */
 
             if ((priv->instance_flags ^ flags)
                 & NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS) {
@@ -7587,36 +7587,36 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error)
     g_return_val_if_fail(!priv->dbus_context, FALSE);
 
     /* when using init_sync(), we use a separate internal GMainContext for
-	 * all D-Bus operations and use our regular async-init code. That means,
-	 * also in sync-init, we don't actually block waiting for our D-Bus requests,
-	 * instead, we only block (g_main_loop_run()) for the overall result.
-	 *
-	 * Doing this has a performance overhead. Also, we cannot ever fall back
-	 * to the regular main-context (not unless we lose the main-owner and
-	 * need to re-initialize). The reason is that we receive events on our
-	 * dbus_context, and this cannot be brought in sync -- short of full
-	 * reinitalizing. Therefor, using sync init not only is slower during
-	 * construction of the object, but NMClient will stick to the dual GMainContext
-	 * mode.
-	 *
-	 * Aside from this downside, the solution is good:
-	 *
-	 * - we don't duplicate the implementation of async-init.
-	 * - we don't iterate the main-context of the caller while waiting for
-	 *   initialization to happen
-	 * - we still invoke all changes under the main_context of the caller.
-	 * - all D-Bus events strictly go through dbus_context and are in order.
-	 */
+     * all D-Bus operations and use our regular async-init code. That means,
+     * also in sync-init, we don't actually block waiting for our D-Bus requests,
+     * instead, we only block (g_main_loop_run()) for the overall result.
+     *
+     * Doing this has a performance overhead. Also, we cannot ever fall back
+     * to the regular main-context (not unless we lose the main-owner and
+     * need to re-initialize). The reason is that we receive events on our
+     * dbus_context, and this cannot be brought in sync -- short of full
+     * reinitalizing. Therefor, using sync init not only is slower during
+     * construction of the object, but NMClient will stick to the dual GMainContext
+     * mode.
+     *
+     * Aside from this downside, the solution is good:
+     *
+     * - we don't duplicate the implementation of async-init.
+     * - we don't iterate the main-context of the caller while waiting for
+     *   initialization to happen
+     * - we still invoke all changes under the main_context of the caller.
+     * - all D-Bus events strictly go through dbus_context and are in order.
+     */
 
     dbus_context       = g_main_context_new();
     priv->dbus_context = g_main_context_ref(dbus_context);
 
     /* We have an inner context. Note that if we loose the name owner, we have a chance
-	 * to resync and drop the inner context. That means, requests made against the inner
-	 * context have a different lifetime. Hence, we create a separate tracking
-	 * object. This "wraps" the outer context-busy-watcher and references it, so
-	 * that the work together. Grep for nm_context_busy_watcher_quark() to
-	 * see how this works. */
+     * to resync and drop the inner context. That means, requests made against the inner
+     * context have a different lifetime. Hence, we create a separate tracking
+     * object. This "wraps" the outer context-busy-watcher and references it, so
+     * that the work together. Grep for nm_context_busy_watcher_quark() to
+     * see how this works. */
     parent_context_busy_watcher = g_steal_pointer(&priv->context_busy_watcher);
     priv->context_busy_watcher  = g_object_new(G_TYPE_OBJECT, NULL);
     g_object_set_qdata_full(priv->context_busy_watcher,
@@ -8013,15 +8013,15 @@ nm_client_class_init(NMClientClass *client_class)
     object_class->dispose      = dispose;
 
     /**
-	 * NMClient:dbus-connection:
-	 *
-	 * The #GDBusConnection to use.
-	 *
-	 * If this is not set during object construction, the D-Bus connection will
-	 * automatically be chosen during async/sync initalization via g_bus_get().
-	 *
-	 * Since: 1.22
-	 */
+     * NMClient:dbus-connection:
+     *
+     * The #GDBusConnection to use.
+     *
+     * If this is not set during object construction, the D-Bus connection will
+     * automatically be chosen during async/sync initalization via g_bus_get().
+     *
+     * Since: 1.22
+     */
     obj_properties[PROP_DBUS_CONNECTION] = g_param_spec_object(
         NM_CLIENT_DBUS_CONNECTION,
         "",
@@ -8030,19 +8030,19 @@ nm_client_class_init(NMClientClass *client_class)
         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:instance-flags:
-	 *
-	 * #NMClientInstanceFlags for the instance. These affect behavior of #NMClient.
-	 * This is a construct property and you may only set most flags only during
-	 * construction.
-	 *
-	 * The flag %NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS can be toggled any time,
-	 * even after constructing the instance. Note that you may want to watch NMClient:permissions-state
-	 * property to know whether permissions are ready. Note that permissions are only fetched
-	 * when NMClient has a D-Bus name owner.
-	 *
-	 * Since: 1.24
-	 */
+     * NMClient:instance-flags:
+     *
+     * #NMClientInstanceFlags for the instance. These affect behavior of #NMClient.
+     * This is a construct property and you may only set most flags only during
+     * construction.
+     *
+     * The flag %NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS can be toggled any time,
+     * even after constructing the instance. Note that you may want to watch NMClient:permissions-state
+     * property to know whether permissions are ready. Note that permissions are only fetched
+     * when NMClient has a D-Bus name owner.
+     *
+     * Since: 1.24
+     */
     obj_properties[PROP_INSTANCE_FLAGS] = g_param_spec_uint(
         NM_CLIENT_INSTANCE_FLAGS,
         "",
@@ -8053,12 +8053,12 @@ nm_client_class_init(NMClientClass *client_class)
         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:dbus-name-owner:
-	 *
-	 * The name owner of the NetworkManager D-Bus service.
-	 *
-	 * Since: 1.22
-	 **/
+     * NMClient:dbus-name-owner:
+     *
+     * The name owner of the NetworkManager D-Bus service.
+     *
+     * Since: 1.22
+     **/
     obj_properties[PROP_DBUS_NAME_OWNER] =
         g_param_spec_string(NM_CLIENT_DBUS_NAME_OWNER,
                             "",
@@ -8067,10 +8067,10 @@ nm_client_class_init(NMClientClass *client_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:version:
-	 *
-	 * The NetworkManager version.
-	 **/
+     * NMClient:version:
+     *
+     * The NetworkManager version.
+     **/
     obj_properties[PROP_VERSION] = g_param_spec_string(NM_CLIENT_VERSION,
                                                        "",
                                                        "",
@@ -8078,10 +8078,10 @@ nm_client_class_init(NMClientClass *client_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:state:
-	 *
-	 * The current daemon state.
-	 **/
+     * NMClient:state:
+     *
+     * The current daemon state.
+     **/
     obj_properties[PROP_STATE] = g_param_spec_enum(NM_CLIENT_STATE,
                                                    "",
                                                    "",
@@ -8090,10 +8090,10 @@ nm_client_class_init(NMClientClass *client_class)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:startup:
-	 *
-	 * Whether the daemon is still starting up.
-	 **/
+     * NMClient:startup:
+     *
+     * Whether the daemon is still starting up.
+     **/
     obj_properties[PROP_STARTUP] = g_param_spec_boolean(NM_CLIENT_STARTUP,
                                                         "",
                                                         "",
@@ -8101,10 +8101,10 @@ nm_client_class_init(NMClientClass *client_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:nm-running:
-	 *
-	 * Whether the daemon is running.
-	 **/
+     * NMClient:nm-running:
+     *
+     * Whether the daemon is running.
+     **/
     obj_properties[PROP_NM_RUNNING] =
         g_param_spec_boolean(NM_CLIENT_NM_RUNNING,
                              "",
@@ -8113,12 +8113,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:networking-enabled:
-	 *
-	 * Whether networking is enabled.
-	 *
-	 * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
-	 */
+     * NMClient:networking-enabled:
+     *
+     * Whether networking is enabled.
+     *
+     * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
+     */
     obj_properties[PROP_NETWORKING_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_NETWORKING_ENABLED,
                              "",
@@ -8127,12 +8127,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wireless-enabled:
-	 *
-	 * Whether wireless is enabled.
-	 *
-	 * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
-	 **/
+     * NMClient:wireless-enabled:
+     *
+     * Whether wireless is enabled.
+     *
+     * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
+     **/
     obj_properties[PROP_WIRELESS_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WIRELESS_ENABLED,
                              "",
@@ -8141,10 +8141,10 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wireless-hardware-enabled:
-	 *
-	 * Whether the wireless hardware is enabled.
-	 **/
+     * NMClient:wireless-hardware-enabled:
+     *
+     * Whether the wireless hardware is enabled.
+     **/
     obj_properties[PROP_WIRELESS_HARDWARE_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WIRELESS_HARDWARE_ENABLED,
                              "",
@@ -8153,12 +8153,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wwan-enabled:
-	 *
-	 * Whether WWAN functionality is enabled.
-	 *
-	 * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
-	 */
+     * NMClient:wwan-enabled:
+     *
+     * Whether WWAN functionality is enabled.
+     *
+     * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
+     */
     obj_properties[PROP_WWAN_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WWAN_ENABLED,
                              "",
@@ -8167,10 +8167,10 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wwan-hardware-enabled:
-	 *
-	 * Whether the WWAN hardware is enabled.
-	 **/
+     * NMClient:wwan-hardware-enabled:
+     *
+     * Whether the WWAN hardware is enabled.
+     **/
     obj_properties[PROP_WWAN_HARDWARE_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WWAN_HARDWARE_ENABLED,
                              "",
@@ -8179,12 +8179,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wimax-enabled:
-	 *
-	 * Whether WiMAX functionality is enabled.
-	 *
-	 * Deprecated: 1.22: WiMAX is no longer supported and this always returns FALSE. The setter has no effect.
-	 */
+     * NMClient:wimax-enabled:
+     *
+     * Whether WiMAX functionality is enabled.
+     *
+     * Deprecated: 1.22: WiMAX is no longer supported and this always returns FALSE. The setter has no effect.
+     */
     obj_properties[PROP_WIMAX_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WIMAX_ENABLED,
                              "",
@@ -8193,12 +8193,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:wimax-hardware-enabled:
-	 *
-	 * Whether the WiMAX hardware is enabled.
-	 *
-	 * Deprecated: 1.22: WiMAX is no longer supported and this always returns FALSE.
-	 **/
+     * NMClient:wimax-hardware-enabled:
+     *
+     * Whether the WiMAX hardware is enabled.
+     *
+     * Deprecated: 1.22: WiMAX is no longer supported and this always returns FALSE.
+     **/
     obj_properties[PROP_WIMAX_HARDWARE_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_WIMAX_HARDWARE_ENABLED,
                              "",
@@ -8207,10 +8207,10 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:active-connections: (type GPtrArray(NMActiveConnection))
-	 *
-	 * The active connections.
-	 **/
+     * NMClient:active-connections: (type GPtrArray(NMActiveConnection))
+     *
+     * The active connections.
+     **/
     obj_properties[PROP_ACTIVE_CONNECTIONS] =
         g_param_spec_boxed(NM_CLIENT_ACTIVE_CONNECTIONS,
                            "",
@@ -8219,10 +8219,10 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:connectivity:
-	 *
-	 * The network connectivity state.
-	 */
+     * NMClient:connectivity:
+     *
+     * The network connectivity state.
+     */
     obj_properties[PROP_CONNECTIVITY] =
         g_param_spec_enum(NM_CLIENT_CONNECTIVITY,
                           "",
@@ -8232,12 +8232,12 @@ nm_client_class_init(NMClientClass *client_class)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient::connectivity-check-available
-	 *
-	 * Whether a connectivity checking service has been configured.
-	 *
-	 * Since: 1.10
-	 */
+     * NMClient::connectivity-check-available
+     *
+     * Whether a connectivity checking service has been configured.
+     *
+     * Since: 1.10
+     */
     obj_properties[PROP_CONNECTIVITY_CHECK_AVAILABLE] =
         g_param_spec_boolean(NM_CLIENT_CONNECTIVITY_CHECK_AVAILABLE,
                              "",
@@ -8246,14 +8246,14 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient::connectivity-check-enabled
-	 *
-	 * Whether a connectivity checking service has been enabled.
-	 *
-	 * Since: 1.10
-	 *
-	 * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
-	 */
+     * NMClient::connectivity-check-enabled
+     *
+     * Whether a connectivity checking service has been enabled.
+     *
+     * Since: 1.10
+     *
+     * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
+     */
     obj_properties[PROP_CONNECTIVITY_CHECK_ENABLED] =
         g_param_spec_boolean(NM_CLIENT_CONNECTIVITY_CHECK_ENABLED,
                              "",
@@ -8262,12 +8262,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:connectivity-check-uri:
-	 *
-	 * The used URI for connectivity checking.
-	 *
-	 * Since: 1.22
-	 **/
+     * NMClient:connectivity-check-uri:
+     *
+     * The used URI for connectivity checking.
+     *
+     * Since: 1.22
+     **/
     obj_properties[PROP_CONNECTIVITY_CHECK_URI] =
         g_param_spec_string(NM_CLIENT_CONNECTIVITY_CHECK_URI,
                             "",
@@ -8276,11 +8276,11 @@ nm_client_class_init(NMClientClass *client_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:primary-connection:
-	 *
-	 * The #NMActiveConnection of the device with the default route;
-	 * see nm_client_get_primary_connection() for more details.
-	 **/
+     * NMClient:primary-connection:
+     *
+     * The #NMActiveConnection of the device with the default route;
+     * see nm_client_get_primary_connection() for more details.
+     **/
     obj_properties[PROP_PRIMARY_CONNECTION] =
         g_param_spec_object(NM_CLIENT_PRIMARY_CONNECTION,
                             "",
@@ -8289,11 +8289,11 @@ nm_client_class_init(NMClientClass *client_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:activating-connection:
-	 *
-	 * The #NMActiveConnection of the activating connection that is
-	 * likely to become the new #NMClient:primary-connection.
-	 **/
+     * NMClient:activating-connection:
+     *
+     * The #NMActiveConnection of the activating connection that is
+     * likely to become the new #NMClient:primary-connection.
+     **/
     obj_properties[PROP_ACTIVATING_CONNECTION] =
         g_param_spec_object(NM_CLIENT_ACTIVATING_CONNECTION,
                             "",
@@ -8302,10 +8302,10 @@ nm_client_class_init(NMClientClass *client_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:devices: (type GPtrArray(NMDevice))
-	 *
-	 * List of real network devices.  Does not include placeholder devices.
-	 **/
+     * NMClient:devices: (type GPtrArray(NMDevice))
+     *
+     * List of real network devices.  Does not include placeholder devices.
+     **/
     obj_properties[PROP_DEVICES] = g_param_spec_boxed(NM_CLIENT_DEVICES,
                                                       "",
                                                       "",
@@ -8313,11 +8313,11 @@ nm_client_class_init(NMClientClass *client_class)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:all-devices: (type GPtrArray(NMDevice))
-	 *
-	 * List of both real devices and device placeholders.
-	 * Since: 1.2
-	 **/
+     * NMClient:all-devices: (type GPtrArray(NMDevice))
+     *
+     * List of both real devices and device placeholders.
+     * Since: 1.2
+     **/
     obj_properties[PROP_ALL_DEVICES] =
         g_param_spec_boxed(NM_CLIENT_ALL_DEVICES,
                            "",
@@ -8326,13 +8326,13 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:connections: (type GPtrArray(NMRemoteConnection))
-	 *
-	 * The list of configured connections that are available to the user. (Note
-	 * that this differs from the underlying D-Bus property, which may also
-	 * contain the object paths of connections that the user does not have
-	 * permission to read the details of.)
-	 */
+     * NMClient:connections: (type GPtrArray(NMRemoteConnection))
+     *
+     * The list of configured connections that are available to the user. (Note
+     * that this differs from the underlying D-Bus property, which may also
+     * contain the object paths of connections that the user does not have
+     * permission to read the details of.)
+     */
     obj_properties[PROP_CONNECTIONS] =
         g_param_spec_boxed(NM_CLIENT_CONNECTIONS,
                            "",
@@ -8341,11 +8341,11 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:hostname:
-	 *
-	 * The machine hostname stored in persistent configuration. This can be
-	 * modified by calling nm_client_save_hostname().
-	 */
+     * NMClient:hostname:
+     *
+     * The machine hostname stored in persistent configuration. This can be
+     * modified by calling nm_client_save_hostname().
+     */
     obj_properties[PROP_HOSTNAME] = g_param_spec_string(NM_CLIENT_HOSTNAME,
                                                         "",
                                                         "",
@@ -8353,10 +8353,10 @@ nm_client_class_init(NMClientClass *client_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:can-modify:
-	 *
-	 * If %TRUE, adding and modifying connections is supported.
-	 */
+     * NMClient:can-modify:
+     *
+     * If %TRUE, adding and modifying connections is supported.
+     */
     obj_properties[PROP_CAN_MODIFY] =
         g_param_spec_boolean(NM_CLIENT_CAN_MODIFY,
                              "",
@@ -8365,12 +8365,12 @@ nm_client_class_init(NMClientClass *client_class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:metered:
-	 *
-	 * Whether the connectivity is metered.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMClient:metered:
+     *
+     * Whether the connectivity is metered.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_METERED] = g_param_spec_uint(NM_CLIENT_METERED,
                                                      "",
                                                      "",
@@ -8380,12 +8380,12 @@ nm_client_class_init(NMClientClass *client_class)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:dns-mode:
-	 *
-	 * The current DNS processing mode.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMClient:dns-mode:
+     *
+     * The current DNS processing mode.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_DNS_MODE] = g_param_spec_string(NM_CLIENT_DNS_MODE,
                                                         "",
                                                         "",
@@ -8393,12 +8393,12 @@ nm_client_class_init(NMClientClass *client_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:dns-rc-manager:
-	 *
-	 * The current resolv.conf management mode.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMClient:dns-rc-manager:
+     *
+     * The current resolv.conf management mode.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_DNS_RC_MANAGER] =
         g_param_spec_string(NM_CLIENT_DNS_RC_MANAGER,
                             "",
@@ -8407,13 +8407,13 @@ nm_client_class_init(NMClientClass *client_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:dns-configuration: (type GPtrArray(NMDnsEntry))
-	 *
-	 * The current DNS configuration, represented as an array
-	 * of #NMDnsEntry objects.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMClient:dns-configuration: (type GPtrArray(NMDnsEntry))
+     *
+     * The current DNS configuration, represented as an array
+     * of #NMDnsEntry objects.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_DNS_CONFIGURATION] =
         g_param_spec_boxed(NM_CLIENT_DNS_CONFIGURATION,
                            "",
@@ -8422,12 +8422,12 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:checkpoints: (type GPtrArray(NMCheckpoint))
-	 *
-	 * The list of active checkpoints.
-	 *
-	 * Since: 1.12
-	 */
+     * NMClient:checkpoints: (type GPtrArray(NMCheckpoint))
+     *
+     * The list of active checkpoints.
+     *
+     * Since: 1.12
+     */
     obj_properties[PROP_CHECKPOINTS] =
         g_param_spec_boxed(NM_CLIENT_CHECKPOINTS,
                            "",
@@ -8436,14 +8436,14 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:capabilities: (type GArray(guint32))
-	 *
-	 * The list of capabilities numbers as guint32 or %NULL if
-	 * there are no capabilities. The numeric value correspond
-	 * to %NMCapability enum.
-	 *
-	 * Since: 1.24
-	 */
+     * NMClient:capabilities: (type GArray(guint32))
+     *
+     * The list of capabilities numbers as guint32 or %NULL if
+     * there are no capabilities. The numeric value correspond
+     * to %NMCapability enum.
+     *
+     * Since: 1.24
+     */
     obj_properties[PROP_CAPABILITIES] =
         g_param_spec_boxed(NM_CLIENT_CAPABILITIES,
                            "",
@@ -8452,24 +8452,24 @@ nm_client_class_init(NMClientClass *client_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMClient:permissions-state:
-	 *
-	 * The state of the cached permissions. The value %NM_TERNARY_DEFAULT
-	 * means that no permissions are yet received (or not yet requested).
-	 * %NM_TERNARY_TRUE means that permissions are received, cached and up
-	 * to date. %NM_TERNARY_FALSE means that permissions were received and are
-	 * cached, but in the meantime a "CheckPermissions" signal was received
-	 * that invalidated the cached permissions.
-	 * Note that NMClient will always emit a notify::permissions-state signal
-	 * when a "CheckPermissions" signal got received or after new permissions
-	 * got received (that is regardless whether the value of the permission state
-	 * actually changed). With this you can watch the permissions-state property
-	 * to know whether the permissions are ready. Note that while NMClient has
-	 * no D-Bus name owner, no permissions are fetched (and this property won't
-	 * change).
-	 *
-	 * Since: 1.24
-	 */
+     * NMClient:permissions-state:
+     *
+     * The state of the cached permissions. The value %NM_TERNARY_DEFAULT
+     * means that no permissions are yet received (or not yet requested).
+     * %NM_TERNARY_TRUE means that permissions are received, cached and up
+     * to date. %NM_TERNARY_FALSE means that permissions were received and are
+     * cached, but in the meantime a "CheckPermissions" signal was received
+     * that invalidated the cached permissions.
+     * Note that NMClient will always emit a notify::permissions-state signal
+     * when a "CheckPermissions" signal got received or after new permissions
+     * got received (that is regardless whether the value of the permission state
+     * actually changed). With this you can watch the permissions-state property
+     * to know whether the permissions are ready. Note that while NMClient has
+     * no D-Bus name owner, no permissions are fetched (and this property won't
+     * change).
+     *
+     * Since: 1.24
+     */
     obj_properties[PROP_PERMISSIONS_STATE] =
         g_param_spec_enum(NM_CLIENT_PERMISSIONS_STATE,
                           "",
@@ -8484,13 +8484,13 @@ nm_client_class_init(NMClientClass *client_class)
                                               &_nml_dbus_meta_iface_nm_dnsmanager);
 
     /**
-	 * NMClient::device-added:
-	 * @client: the client that received the signal
-	 * @device: (type NMDevice): the new device
-	 *
-	 * Notifies that a #NMDevice is added.  This signal is not emitted for
-	 * placeholder devices.
-	 **/
+     * NMClient::device-added:
+     * @client: the client that received the signal
+     * @device: (type NMDevice): the new device
+     *
+     * Notifies that a #NMDevice is added.  This signal is not emitted for
+     * placeholder devices.
+     **/
     signals[DEVICE_ADDED] = g_signal_new(NM_CLIENT_DEVICE_ADDED,
                                          G_OBJECT_CLASS_TYPE(object_class),
                                          G_SIGNAL_RUN_FIRST,
@@ -8503,13 +8503,13 @@ nm_client_class_init(NMClientClass *client_class)
                                          G_TYPE_OBJECT);
 
     /**
-	 * NMClient::device-removed:
-	 * @client: the client that received the signal
-	 * @device: (type NMDevice): the removed device
-	 *
-	 * Notifies that a #NMDevice is removed.  This signal is not emitted for
-	 * placeholder devices.
-	 **/
+     * NMClient::device-removed:
+     * @client: the client that received the signal
+     * @device: (type NMDevice): the removed device
+     *
+     * Notifies that a #NMDevice is removed.  This signal is not emitted for
+     * placeholder devices.
+     **/
     signals[DEVICE_REMOVED] = g_signal_new(NM_CLIENT_DEVICE_REMOVED,
                                            G_OBJECT_CLASS_TYPE(object_class),
                                            G_SIGNAL_RUN_FIRST,
@@ -8522,13 +8522,13 @@ nm_client_class_init(NMClientClass *client_class)
                                            G_TYPE_OBJECT);
 
     /**
-	 * NMClient::any-device-added:
-	 * @client: the client that received the signal
-	 * @device: (type NMDevice): the new device
-	 *
-	 * Notifies that a #NMDevice is added.  This signal is emitted for both
-	 * regular devices and placeholder devices.
-	 **/
+     * NMClient::any-device-added:
+     * @client: the client that received the signal
+     * @device: (type NMDevice): the new device
+     *
+     * Notifies that a #NMDevice is added.  This signal is emitted for both
+     * regular devices and placeholder devices.
+     **/
     signals[ANY_DEVICE_ADDED] = g_signal_new(NM_CLIENT_ANY_DEVICE_ADDED,
                                              G_OBJECT_CLASS_TYPE(object_class),
                                              G_SIGNAL_RUN_FIRST,
@@ -8541,13 +8541,13 @@ nm_client_class_init(NMClientClass *client_class)
                                              G_TYPE_OBJECT);
 
     /**
-	 * NMClient::any-device-removed:
-	 * @client: the client that received the signal
-	 * @device: (type NMDevice): the removed device
-	 *
-	 * Notifies that a #NMDevice is removed.  This signal is emitted for both
-	 * regular devices and placeholder devices.
-	 **/
+     * NMClient::any-device-removed:
+     * @client: the client that received the signal
+     * @device: (type NMDevice): the removed device
+     *
+     * Notifies that a #NMDevice is removed.  This signal is emitted for both
+     * regular devices and placeholder devices.
+     **/
     signals[ANY_DEVICE_REMOVED] = g_signal_new(NM_CLIENT_ANY_DEVICE_REMOVED,
                                                G_OBJECT_CLASS_TYPE(object_class),
                                                G_SIGNAL_RUN_FIRST,
@@ -8560,13 +8560,13 @@ nm_client_class_init(NMClientClass *client_class)
                                                G_TYPE_OBJECT);
 
     /**
-	 * NMClient::permission-changed:
-	 * @client: the client that received the signal
-	 * @permission: a permission from #NMClientPermission
-	 * @result: the permission's result, one of #NMClientPermissionResult
-	 *
-	 * Notifies that a permission has changed
-	 **/
+     * NMClient::permission-changed:
+     * @client: the client that received the signal
+     * @permission: a permission from #NMClientPermission
+     * @result: the permission's result, one of #NMClientPermissionResult
+     *
+     * Notifies that a permission has changed
+     **/
     signals[PERMISSION_CHANGED] = g_signal_new(NM_CLIENT_PERMISSION_CHANGED,
                                                G_OBJECT_CLASS_TYPE(object_class),
                                                G_SIGNAL_RUN_FIRST,
@@ -8579,12 +8579,12 @@ nm_client_class_init(NMClientClass *client_class)
                                                G_TYPE_UINT,
                                                G_TYPE_UINT);
     /**
-	 * NMClient::connection-added:
-	 * @client: the settings object that received the signal
-	 * @connection: the new connection
-	 *
-	 * Notifies that a #NMConnection has been added.
-	 **/
+     * NMClient::connection-added:
+     * @client: the settings object that received the signal
+     * @connection: the new connection
+     *
+     * Notifies that a #NMConnection has been added.
+     **/
     signals[CONNECTION_ADDED] = g_signal_new(NM_CLIENT_CONNECTION_ADDED,
                                              G_OBJECT_CLASS_TYPE(object_class),
                                              G_SIGNAL_RUN_FIRST,
@@ -8597,12 +8597,12 @@ nm_client_class_init(NMClientClass *client_class)
                                              NM_TYPE_REMOTE_CONNECTION);
 
     /**
-	 * NMClient::connection-removed:
-	 * @client: the settings object that received the signal
-	 * @connection: the removed connection
-	 *
-	 * Notifies that a #NMConnection has been removed.
-	 **/
+     * NMClient::connection-removed:
+     * @client: the settings object that received the signal
+     * @connection: the removed connection
+     *
+     * Notifies that a #NMConnection has been removed.
+     **/
     signals[CONNECTION_REMOVED] = g_signal_new(NM_CLIENT_CONNECTION_REMOVED,
                                                G_OBJECT_CLASS_TYPE(object_class),
                                                G_SIGNAL_RUN_FIRST,
@@ -8615,12 +8615,12 @@ nm_client_class_init(NMClientClass *client_class)
                                                NM_TYPE_REMOTE_CONNECTION);
 
     /**
-	 * NMClient::active-connection-added:
-	 * @client: the settings object that received the signal
-	 * @active_connection: the new active connection
-	 *
-	 * Notifies that a #NMActiveConnection has been added.
-	 **/
+     * NMClient::active-connection-added:
+     * @client: the settings object that received the signal
+     * @active_connection: the new active connection
+     *
+     * Notifies that a #NMActiveConnection has been added.
+     **/
     signals[ACTIVE_CONNECTION_ADDED] = g_signal_new(NM_CLIENT_ACTIVE_CONNECTION_ADDED,
                                                     G_OBJECT_CLASS_TYPE(object_class),
                                                     G_SIGNAL_RUN_FIRST,
@@ -8633,12 +8633,12 @@ nm_client_class_init(NMClientClass *client_class)
                                                     NM_TYPE_ACTIVE_CONNECTION);
 
     /**
-	 * NMClient::active-connection-removed:
-	 * @client: the settings object that received the signal
-	 * @active_connection: the removed active connection
-	 *
-	 * Notifies that a #NMActiveConnection has been removed.
-	 **/
+     * NMClient::active-connection-removed:
+     * @client: the settings object that received the signal
+     * @active_connection: the removed active connection
+     *
+     * Notifies that a #NMActiveConnection has been removed.
+     **/
     signals[ACTIVE_CONNECTION_REMOVED] = g_signal_new(NM_CLIENT_ACTIVE_CONNECTION_REMOVED,
                                                       G_OBJECT_CLASS_TYPE(object_class),
                                                       G_SIGNAL_RUN_FIRST,
diff --git a/libnm/nm-device-6lowpan.c b/libnm/nm-device-6lowpan.c
index 517d11e7cc..aaef76420e 100644
--- a/libnm/nm-device-6lowpan.c
+++ b/libnm/nm-device-6lowpan.c
@@ -119,12 +119,12 @@ nm_device_6lowpan_class_init(NMDevice6LowpanClass *klass)
     _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDevice6LowpanPrivate, parent);
 
     /**
-	 * NMDevice6Lowpan:parent:
-	 *
-	 * The devices's parent device.
-	 *
-	 * Since: 1.14
-	 **/
+     * NMDevice6Lowpan:parent:
+     *
+     * The devices's parent device.
+     *
+     * Since: 1.14
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_6LOWPAN_PARENT,
                                                       "",
                                                       "",
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index 5465969f2a..e3e2d013ac 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -116,10 +116,10 @@ nm_device_adsl_class_init(NMDeviceAdslClass *adsl_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceAdsl:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceAdsl:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_ADSL_CARRIER,
                                                         "",
                                                         "",
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 4f51aa2420..5295f041cb 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -186,10 +186,10 @@ nm_device_bond_class_init(NMDeviceBondClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceBond:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceBond:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_BOND_CARRIER,
                                                         "",
                                                         "",
@@ -197,10 +197,10 @@ nm_device_bond_class_init(NMDeviceBondClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceBond:slaves: (type GPtrArray(NMDevice))
-	 *
-	 * The devices enslaved to the bond device.
-	 **/
+     * NMDeviceBond:slaves: (type GPtrArray(NMDevice))
+     *
+     * The devices enslaved to the bond device.
+     **/
     obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_BOND_SLAVES,
                                                      "",
                                                      "",
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 5b20f76faa..871877d516 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -179,10 +179,10 @@ nm_device_bridge_class_init(NMDeviceBridgeClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceBridge:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceBridge:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_BRIDGE_CARRIER,
                                                         "",
                                                         "",
@@ -190,10 +190,10 @@ nm_device_bridge_class_init(NMDeviceBridgeClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceBridge:slaves: (type GPtrArray(NMDevice))
-	 *
-	 * The devices enslaved to the bridge device.
-	 **/
+     * NMDeviceBridge:slaves: (type GPtrArray(NMDevice))
+     *
+     * The devices enslaved to the bridge device.
+     **/
     obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_BRIDGE_SLAVES,
                                                      "",
                                                      "",
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index fd89a30e47..ed4ff1eae0 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -243,10 +243,10 @@ nm_device_bt_class_init(NMDeviceBtClass *bt_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceBt:name:
-	 *
-	 * The name of the bluetooth device.
-	 **/
+     * NMDeviceBt:name:
+     *
+     * The name of the bluetooth device.
+     **/
     obj_properties[PROP_NAME] = g_param_spec_string(NM_DEVICE_BT_NAME,
                                                     "",
                                                     "",
@@ -254,10 +254,10 @@ nm_device_bt_class_init(NMDeviceBtClass *bt_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceBt:bt-capabilities:
-	 *
-	 * The device's bluetooth capabilities, a combination of #NMBluetoothCapabilities.
-	 **/
+     * NMDeviceBt:bt-capabilities:
+     *
+     * The device's bluetooth capabilities, a combination of #NMBluetoothCapabilities.
+     **/
     obj_properties[PROP_BT_CAPABILITIES] =
         g_param_spec_flags(NM_DEVICE_BT_CAPABILITIES,
                            "",
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index e337e2d497..22e28f7c22 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -213,7 +213,7 @@ connection_compatible(NMDevice *device, NMConnection *connection, GError **error
         s_mac     = nm_setting_wired_get_mac_address(s_wired);
         if (perm_addr) {
             /* Virtual devices will have empty permanent addr but they should not be excluded
-			 * from the MAC address check specified in the connection */
+             * from the MAC address check specified in the connection */
             if (*perm_addr == 0)
                 perm_addr = nm_device_get_hw_address(NM_DEVICE(device));
 
@@ -349,10 +349,10 @@ nm_device_ethernet_class_init(NMDeviceEthernetClass *eth_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceEthernet:perm-hw-address:
-	 *
-	 * The permanent hardware (MAC) address of the device.
-	 **/
+     * NMDeviceEthernet:perm-hw-address:
+     *
+     * The permanent hardware (MAC) address of the device.
+     **/
     obj_properties[PROP_PERM_HW_ADDRESS] =
         g_param_spec_string(NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS,
                             "",
@@ -361,10 +361,10 @@ nm_device_ethernet_class_init(NMDeviceEthernetClass *eth_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceEthernet:speed:
-	 *
-	 * The speed of the device.
-	 **/
+     * NMDeviceEthernet:speed:
+     *
+     * The speed of the device.
+     **/
     obj_properties[PROP_SPEED] = g_param_spec_uint(NM_DEVICE_ETHERNET_SPEED,
                                                    "",
                                                    "",
@@ -374,10 +374,10 @@ nm_device_ethernet_class_init(NMDeviceEthernetClass *eth_class)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceEthernet:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceEthernet:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_ETHERNET_CARRIER,
                                                         "",
                                                         "",
@@ -385,13 +385,13 @@ nm_device_ethernet_class_init(NMDeviceEthernetClass *eth_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceEthernet:s390-subchannels:
-	 *
-	 * Identifies subchannels of this network device used for
-	 * communication with z/VM or s390 host.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceEthernet:s390-subchannels:
+     *
+     * Identifies subchannels of this network device used for
+     * communication with z/VM or s390 host.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_S390_SUBCHANNELS] =
         g_param_spec_boxed(NM_DEVICE_ETHERNET_S390_SUBCHANNELS,
                            "",
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 4153b974c7..93b03bb093 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -158,11 +158,11 @@ nm_device_generic_class_init(NMDeviceGenericClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceGeneric:type-description:
-	 *
-	 * A description of the specific type of device this is, or %NULL
-	 * if not known.
-	 **/
+     * NMDeviceGeneric:type-description:
+     *
+     * A description of the specific type of device this is, or %NULL
+     * if not known.
+     **/
     obj_properties[PROP_TYPE_DESCRIPTION] =
         g_param_spec_string(NM_DEVICE_GENERIC_TYPE_DESCRIPTION,
                             "",
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 3c998eccaa..050978b2a7 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -163,10 +163,10 @@ nm_device_infiniband_class_init(NMDeviceInfinibandClass *ib_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceInfiniband:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceInfiniband:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_INFINIBAND_CARRIER,
                                                         "",
                                                         "",
diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c
index 40c5a69f80..a680bb0bfe 100644
--- a/libnm/nm-device-ip-tunnel.c
+++ b/libnm/nm-device-ip-tunnel.c
@@ -398,12 +398,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceIPTunnel:mode:
-	 *
-	 * The tunneling mode of the device.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:mode:
+     *
+     * The tunneling mode of the device.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_MODE] = g_param_spec_uint(NM_DEVICE_IP_TUNNEL_MODE,
                                                   "",
                                                   "",
@@ -413,12 +413,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:parent:
-	 *
-	 * The devices's parent device.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:parent:
+     *
+     * The devices's parent device.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_IP_TUNNEL_PARENT,
                                                       "",
                                                       "",
@@ -426,12 +426,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:local:
-	 *
-	 * The local endpoint of the tunnel.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:local:
+     *
+     * The local endpoint of the tunnel.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_LOCAL] = g_param_spec_string(NM_DEVICE_IP_TUNNEL_LOCAL,
                                                      "",
                                                      "",
@@ -439,12 +439,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:remote:
-	 *
-	 * The remote endpoint of the tunnel.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:remote:
+     *
+     * The remote endpoint of the tunnel.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_REMOTE] = g_param_spec_string(NM_DEVICE_IP_TUNNEL_REMOTE,
                                                       "",
                                                       "",
@@ -452,13 +452,13 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:ttl:
-	 *
-	 * The TTL assigned to tunneled packets. 0 is a special value
-	 *  meaning that packets inherit the TTL value
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:ttl:
+     *
+     * The TTL assigned to tunneled packets. 0 is a special value
+     *  meaning that packets inherit the TTL value
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_TTL] = g_param_spec_uchar(NM_DEVICE_IP_TUNNEL_TTL,
                                                   "",
                                                   "",
@@ -468,13 +468,13 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:tos:
-	 *
-	 * The type of service (IPv4) or traffic class (IPv6) assigned to
-	 * tunneled packets.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:tos:
+     *
+     * The type of service (IPv4) or traffic class (IPv6) assigned to
+     * tunneled packets.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_TOS] = g_param_spec_uchar(NM_DEVICE_IP_TUNNEL_TOS,
                                                   "",
                                                   "",
@@ -484,12 +484,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:path-mtu-discovery:
-	 *
-	 * Whether path MTU discovery is enabled on this tunnel.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:path-mtu-discovery:
+     *
+     * Whether path MTU discovery is enabled on this tunnel.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_PATH_MTU_DISCOVERY] =
         g_param_spec_boolean(NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY,
                              "",
@@ -498,12 +498,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:input-key:
-	 *
-	 * The key used for tunneled input packets, if applicable.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:input-key:
+     *
+     * The key used for tunneled input packets, if applicable.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_INPUT_KEY] = g_param_spec_string(NM_DEVICE_IP_TUNNEL_INPUT_KEY,
                                                          "",
                                                          "",
@@ -511,12 +511,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:output-key:
-	 *
-	 * The key used for tunneled output packets, if applicable.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:output-key:
+     *
+     * The key used for tunneled output packets, if applicable.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_OUTPUT_KEY] =
         g_param_spec_string(NM_DEVICE_IP_TUNNEL_OUTPUT_KEY,
                             "",
@@ -525,14 +525,14 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:encapsulation-limit:
-	 *
-	 * How many additional levels of encapsulation are permitted to
-	 * be prepended to packets. This property applies only to IPv6
-	 * tunnels.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:encapsulation-limit:
+     *
+     * How many additional levels of encapsulation are permitted to
+     * be prepended to packets. This property applies only to IPv6
+     * tunnels.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_ENCAPSULATION_LIMIT] =
         g_param_spec_uchar(NM_DEVICE_IP_TUNNEL_ENCAPSULATION_LIMIT,
                            "",
@@ -543,13 +543,13 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:flow-label:
-	 *
-	 * The flow label to assign to tunnel packets. This property
-	 * applies only to IPv6 tunnels.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceIPTunnel:flow-label:
+     *
+     * The flow label to assign to tunnel packets. This property
+     * applies only to IPv6 tunnels.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_FLOW_LABEL] = g_param_spec_uint(NM_DEVICE_IP_TUNNEL_FLOW_LABEL,
                                                         "",
                                                         "",
@@ -559,12 +559,12 @@ nm_device_ip_tunnel_class_init(NMDeviceIPTunnelClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceIPTunnel:flags:
-	 *
-	 * Tunnel flags.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMDeviceIPTunnel:flags:
+     *
+     * Tunnel flags.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_FLAGS] = g_param_spec_uint(NM_DEVICE_IP_TUNNEL_FLAGS,
                                                    "",
                                                    "",
diff --git a/libnm/nm-device-macsec.c b/libnm/nm-device-macsec.c
index 527829c4d9..998adc2c41 100644
--- a/libnm/nm-device-macsec.c
+++ b/libnm/nm-device-macsec.c
@@ -439,12 +439,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
     _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceMacsecPrivate, parent);
 
     /**
-	 * NMDeviceMacsec:parent:
-	 *
-	 * The devices's parent device.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:parent:
+     *
+     * The devices's parent device.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_MACSEC_PARENT,
                                                       "",
                                                       "",
@@ -452,12 +452,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:sci:
-	 *
-	 * The Secure Channel Identifier in use.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:sci:
+     *
+     * The Secure Channel Identifier in use.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_SCI] = g_param_spec_uint64(NM_DEVICE_MACSEC_SCI,
                                                    "",
                                                    "",
@@ -467,12 +467,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:icv-length:
-	 *
-	 * The length of ICV (Integrity Check Value).
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:icv-length:
+     *
+     * The length of ICV (Integrity Check Value).
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_ICV_LENGTH] = g_param_spec_uchar(NM_DEVICE_MACSEC_ICV_LENGTH,
                                                          "",
                                                          "",
@@ -482,12 +482,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:cipher-suite:
-	 *
-	 * The set of cryptographic algorithms in use.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:cipher-suite:
+     *
+     * The set of cryptographic algorithms in use.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_CIPHER_SUITE] =
         g_param_spec_uint64(NM_DEVICE_MACSEC_CIPHER_SUITE,
                             "",
@@ -498,12 +498,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:window:
-	 *
-	 * The size of the replay window.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:window:
+     *
+     * The size of the replay window.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_WINDOW] = g_param_spec_uint(NM_DEVICE_MACSEC_WINDOW,
                                                     "",
                                                     "",
@@ -513,13 +513,13 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:encoding-sa:
-	 *
-	 * The value of the Association Number (0..3) for the Security
-	 * Association in use.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:encoding-sa:
+     *
+     * The value of the Association Number (0..3) for the Security
+     * Association in use.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_ENCODING_SA] =
         g_param_spec_uchar(NM_DEVICE_MACSEC_ENCODING_SA,
                            "",
@@ -530,13 +530,13 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:validation:
-	 *
-	 * The validation mode for incoming packets (strict, check,
-	 * disabled).
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:validation:
+     *
+     * The validation mode for incoming packets (strict, check,
+     * disabled).
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_VALIDATION] =
         g_param_spec_string(NM_DEVICE_MACSEC_VALIDATION,
                             "",
@@ -545,12 +545,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:encrypt:
-	 *
-	 * Whether encryption of transmitted frames is enabled.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:encrypt:
+     *
+     * Whether encryption of transmitted frames is enabled.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_ENCRYPT] = g_param_spec_boolean(NM_DEVICE_MACSEC_ENCRYPT,
                                                         "",
                                                         "",
@@ -558,12 +558,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:protect:
-	 *
-	 * Whether protection of transmitted frames is enabled.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:protect:
+     *
+     * Whether protection of transmitted frames is enabled.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_PROTECT] = g_param_spec_boolean(NM_DEVICE_MACSEC_PROTECT,
                                                         "",
                                                         "",
@@ -571,13 +571,13 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:include-sci:
-	 *
-	 * Whether the SCI is always included in SecTAG for transmitted
-	 * frames.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:include-sci:
+     *
+     * Whether the SCI is always included in SecTAG for transmitted
+     * frames.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_INCLUDE_SCI] =
         g_param_spec_boolean(NM_DEVICE_MACSEC_INCLUDE_SCI,
                              "",
@@ -586,13 +586,13 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:es:
-	 *
-	 * Whether the ES (End station) bit is enabled in SecTAG for
-	 * transmitted frames.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:es:
+     *
+     * Whether the ES (End station) bit is enabled in SecTAG for
+     * transmitted frames.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_ES] = g_param_spec_boolean(NM_DEVICE_MACSEC_ES,
                                                    "",
                                                    "",
@@ -600,13 +600,13 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:scb:
-	 *
-	 * Whether the SCB (Single Copy Broadcast) bit is enabled in
-	 * SecTAG for transmitted frames.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:scb:
+     *
+     * Whether the SCB (Single Copy Broadcast) bit is enabled in
+     * SecTAG for transmitted frames.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_SCB] = g_param_spec_boolean(NM_DEVICE_MACSEC_SCB,
                                                     "",
                                                     "",
@@ -614,12 +614,12 @@ nm_device_macsec_class_init(NMDeviceMacsecClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacsec:replay-protect:
-	 *
-	 * Whether replay protection is enabled.
-	 *
-	 * Since: 1.6
-	 **/
+     * NMDeviceMacsec:replay-protect:
+     *
+     * Whether replay protection is enabled.
+     *
+     * Since: 1.6
+     **/
     obj_properties[PROP_REPLAY_PROTECT] =
         g_param_spec_boolean(NM_DEVICE_MACSEC_REPLAY_PROTECT,
                              "",
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
index 2be042dc21..2d4337dd60 100644
--- a/libnm/nm-device-macvlan.c
+++ b/libnm/nm-device-macvlan.c
@@ -242,12 +242,12 @@ nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceMacvlan:parent:
-	 *
-	 * The devices's parent device.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceMacvlan:parent:
+     *
+     * The devices's parent device.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_MACVLAN_PARENT,
                                                       "",
                                                       "",
@@ -255,12 +255,12 @@ nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacvlan:mode:
-	 *
-	 * The MACVLAN mode.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceMacvlan:mode:
+     *
+     * The MACVLAN mode.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_MODE] = g_param_spec_string(NM_DEVICE_MACVLAN_MODE,
                                                     "",
                                                     "",
@@ -268,12 +268,12 @@ nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacvlan:no-promisc:
-	 *
-	 * Whether the device has the no-promiscuos flag.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceMacvlan:no-promisc:
+     *
+     * Whether the device has the no-promiscuos flag.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_NO_PROMISC] =
         g_param_spec_boolean(NM_DEVICE_MACVLAN_NO_PROMISC,
                              "",
@@ -282,12 +282,12 @@ nm_device_macvlan_class_init(NMDeviceMacvlanClass *klass)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceMacvlan:tap:
-	 *
-	 * Whether the device is a MACVTAP.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceMacvlan:tap:
+     *
+     * Whether the device is a MACVTAP.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_TAP] = g_param_spec_boolean(NM_DEVICE_MACVLAN_TAP,
                                                     "",
                                                     "",
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 68f1601967..bbb03a358d 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -293,13 +293,13 @@ nm_device_modem_class_init(NMDeviceModemClass *modem_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceModem:modem-capabilities:
-	 *
-	 * The generic family of access technologies the modem supports.  Not all
-	 * capabilities are available at the same time however; some modems require
-	 * a firmware reload or other reinitialization to switch between eg
-	 * CDMA/EVDO and GSM/UMTS.
-	 **/
+     * NMDeviceModem:modem-capabilities:
+     *
+     * The generic family of access technologies the modem supports.  Not all
+     * capabilities are available at the same time however; some modems require
+     * a firmware reload or other reinitialization to switch between eg
+     * CDMA/EVDO and GSM/UMTS.
+     **/
     obj_properties[PROP_MODEM_CAPABILITIES] =
         g_param_spec_flags(NM_DEVICE_MODEM_MODEM_CAPABILITIES,
                            "",
@@ -309,11 +309,11 @@ nm_device_modem_class_init(NMDeviceModemClass *modem_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceModem:current-capabilities:
-	 *
-	 * The generic family of access technologies the modem currently supports
-	 * without a firmware reload or reinitialization.
-	 **/
+     * NMDeviceModem:current-capabilities:
+     *
+     * The generic family of access technologies the modem currently supports
+     * without a firmware reload or reinitialization.
+     **/
     obj_properties[PROP_CURRENT_CAPABILITIES] =
         g_param_spec_flags(NM_DEVICE_MODEM_CURRENT_CAPABILITIES,
                            "",
@@ -323,10 +323,10 @@ nm_device_modem_class_init(NMDeviceModemClass *modem_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceModem:device-id:
-	 *
-	 * Since: 1.20
-	 **/
+     * NMDeviceModem:device-id:
+     *
+     * Since: 1.20
+     **/
     obj_properties[PROP_DEVICE_ID] = g_param_spec_string(NM_DEVICE_MODEM_DEVICE_ID,
                                                          "",
                                                          "",
@@ -334,10 +334,10 @@ nm_device_modem_class_init(NMDeviceModemClass *modem_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceModem:operator-code:
-	 *
-	 * Since: 1.20
-	 **/
+     * NMDeviceModem:operator-code:
+     *
+     * Since: 1.20
+     **/
     obj_properties[PROP_OPERATOR_CODE] =
         g_param_spec_string(NM_DEVICE_MODEM_OPERATOR_CODE,
                             "",
@@ -346,10 +346,10 @@ nm_device_modem_class_init(NMDeviceModemClass *modem_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceModem:apn:
-	 *
-	 * Since: 1.20
-	 **/
+     * NMDeviceModem:apn:
+     *
+     * Since: 1.20
+     **/
     obj_properties[PROP_APN] = g_param_spec_string(NM_DEVICE_MODEM_APN,
                                                    "",
                                                    "",
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 86c9bd2b60..534105897b 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -172,10 +172,10 @@ nm_device_olpc_mesh_class_init(NMDeviceOlpcMeshClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceOlpcMesh:companion:
-	 *
-	 * The companion device.
-	 **/
+     * NMDeviceOlpcMesh:companion:
+     *
+     * The companion device.
+     **/
     obj_properties[PROP_COMPANION] = g_param_spec_object(NM_DEVICE_OLPC_MESH_COMPANION,
                                                          "",
                                                          "",
@@ -183,10 +183,10 @@ nm_device_olpc_mesh_class_init(NMDeviceOlpcMeshClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceOlpcMesh:active-channel:
-	 *
-	 * The device's active channel.
-	 **/
+     * NMDeviceOlpcMesh:active-channel:
+     *
+     * The device's active channel.
+     **/
     obj_properties[PROP_ACTIVE_CHANNEL] =
         g_param_spec_uint(NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL,
                           "",
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index cee391d389..6ca501144f 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -152,12 +152,12 @@ nm_device_ovs_bridge_class_init(NMDeviceOvsBridgeClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceOvsBridge:slaves: (type GPtrArray(NMDevice))
-	 *
-	 * Gets the ports currently enslaved to the device.
-	 *
-	 * Since: 1.22
-	 */
+     * NMDeviceOvsBridge:slaves: (type GPtrArray(NMDevice))
+     *
+     * Gets the ports currently enslaved to the device.
+     *
+     * Since: 1.22
+     */
     obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_OVS_BRIDGE_SLAVES,
                                                      "",
                                                      "",
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index 8f56daa499..301ef2ccd6 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -152,12 +152,12 @@ nm_device_ovs_port_class_init(NMDeviceOvsPortClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceOvsPort:slaves: (type GPtrArray(NMDevice))
-	 *
-	 * Gets the interfaces currently enslaved to the device.
-	 *
-	 * Since: 1.22
-	 */
+     * NMDeviceOvsPort:slaves: (type GPtrArray(NMDevice))
+     *
+     * Gets the interfaces currently enslaved to the device.
+     *
+     * Since: 1.22
+     */
     obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_OVS_PORT_SLAVES,
                                                      "",
                                                      "",
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index ec2adedbd8..cfb6e69ddf 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -209,10 +209,10 @@ nm_device_team_class_init(NMDeviceTeamClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceTeam:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceTeam:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_TEAM_CARRIER,
                                                         "",
                                                         "",
@@ -220,10 +220,10 @@ nm_device_team_class_init(NMDeviceTeamClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTeam:slaves: (type GPtrArray(NMDevice))
-	 *
-	 * The devices enslaved to the team device.
-	 **/
+     * NMDeviceTeam:slaves: (type GPtrArray(NMDevice))
+     *
+     * The devices enslaved to the team device.
+     **/
     obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_TEAM_SLAVES,
                                                      "",
                                                      "",
@@ -231,12 +231,12 @@ nm_device_team_class_init(NMDeviceTeamClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTeam:config:
-	 *
-	 * The current JSON configuration of the device.
-	 *
-	 * Since: 1.4
-	 **/
+     * NMDeviceTeam:config:
+     *
+     * The current JSON configuration of the device.
+     *
+     * Since: 1.4
+     **/
     obj_properties[PROP_CONFIG] = g_param_spec_string(NM_DEVICE_TEAM_CONFIG,
                                                       "",
                                                       "",
diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index 1affee9c9d..084d846ed9 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -304,12 +304,12 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceTun:mode:
-	 *
-	 * The tunnel mode, either "tun" or "tap".
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:mode:
+     *
+     * The tunnel mode, either "tun" or "tap".
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_MODE] = g_param_spec_string(NM_DEVICE_TUN_MODE,
                                                     "",
                                                     "",
@@ -317,12 +317,12 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTun:owner:
-	 *
-	 * The uid of the tunnel owner, or -1 if it has no owner.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:owner:
+     *
+     * The uid of the tunnel owner, or -1 if it has no owner.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_OWNER] = g_param_spec_int64(NM_DEVICE_TUN_OWNER,
                                                     "",
                                                     "",
@@ -332,12 +332,12 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTun:group:
-	 *
-	 * The gid of the tunnel group, or -1 if it has no owner.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:group:
+     *
+     * The gid of the tunnel group, or -1 if it has no owner.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_GROUP] = g_param_spec_int64(NM_DEVICE_TUN_GROUP,
                                                     "",
                                                     "",
@@ -347,13 +347,13 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTun:no-pi:
-	 *
-	 * The tunnel's "TUN_NO_PI" flag; true if no protocol info is
-	 * prepended to the tunnel packets.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:no-pi:
+     *
+     * The tunnel's "TUN_NO_PI" flag; true if no protocol info is
+     * prepended to the tunnel packets.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_NO_PI] = g_param_spec_boolean(NM_DEVICE_TUN_NO_PI,
                                                       "",
                                                       "",
@@ -361,13 +361,13 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTun:vnet-hdr:
-	 *
-	 * The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
-	 * include a virtio network header.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:vnet-hdr:
+     *
+     * The tunnel's "TUN_VNET_HDR" flag; true if the tunnel packets
+     * include a virtio network header.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_VNET_HDR] = g_param_spec_boolean(NM_DEVICE_TUN_VNET_HDR,
                                                          "",
                                                          "",
@@ -375,14 +375,14 @@ nm_device_tun_class_init(NMDeviceTunClass *gre_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceTun:multi-queue:
-	 *
-	 * The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
-	 * the tap device multiple times, for multiple send/receive
-	 * queues.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceTun:multi-queue:
+     *
+     * The tunnel's "TUN_TAP_MQ" flag; true if callers can connect to
+     * the tap device multiple times, for multiple send/receive
+     * queues.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_MULTI_QUEUE] =
         g_param_spec_boolean(NM_DEVICE_TUN_MULTI_QUEUE,
                              "",
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 8af2163b6d..1abb046ebb 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -219,10 +219,10 @@ nm_device_vlan_class_init(NMDeviceVlanClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceVlan:carrier:
-	 *
-	 * Whether the device has carrier.
-	 **/
+     * NMDeviceVlan:carrier:
+     *
+     * Whether the device has carrier.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_VLAN_CARRIER,
                                                         "",
                                                         "",
@@ -230,10 +230,10 @@ nm_device_vlan_class_init(NMDeviceVlanClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVlan:parent:
-	 *
-	 * The devices's parent device.
-	 **/
+     * NMDeviceVlan:parent:
+     *
+     * The devices's parent device.
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_VLAN_PARENT,
                                                       "",
                                                       "",
@@ -241,10 +241,10 @@ nm_device_vlan_class_init(NMDeviceVlanClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVlan:vlan-id:
-	 *
-	 * The device's VLAN ID.
-	 **/
+     * NMDeviceVlan:vlan-id:
+     *
+     * The device's VLAN ID.
+     **/
     obj_properties[PROP_VLAN_ID] = g_param_spec_uint(NM_DEVICE_VLAN_VLAN_ID,
                                                      "",
                                                      "",
diff --git a/libnm/nm-device-vrf.c b/libnm/nm-device-vrf.c
index 0e48ed0aa3..3b86e4d081 100644
--- a/libnm/nm-device-vrf.c
+++ b/libnm/nm-device-vrf.c
@@ -127,12 +127,12 @@ nm_device_vrf_class_init(NMDeviceVrfClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceVrf:table:
-	 *
-	 * The device's VRF table.
-	 *
-	 * Since: 1.24
-	 **/
+     * NMDeviceVrf:table:
+     *
+     * The device's VRF table.
+     *
+     * Since: 1.24
+     **/
     obj_properties[PROP_TABLE] = g_param_spec_uint(NM_DEVICE_VRF_TABLE,
                                                    "",
                                                    "",
diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c
index 0d613b6434..bd6de1e1f5 100644
--- a/libnm/nm-device-vxlan.c
+++ b/libnm/nm-device-vxlan.c
@@ -537,14 +537,14 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceVxlan:carrier:
-	 *
-	 * Whether the device has carrier.
-	 *
-	 * Since: 1.2
-	 *
-	 * This property is not implemented yet, and the property is always FALSE.
-	 **/
+     * NMDeviceVxlan:carrier:
+     *
+     * Whether the device has carrier.
+     *
+     * Since: 1.2
+     *
+     * This property is not implemented yet, and the property is always FALSE.
+     **/
     obj_properties[PROP_CARRIER] = g_param_spec_boolean(NM_DEVICE_VXLAN_CARRIER,
                                                         "",
                                                         "",
@@ -552,12 +552,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:parent:
-	 *
-	 * The devices's parent device.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceVxlan:parent:
+     *
+     * The devices's parent device.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_PARENT] = g_param_spec_object(NM_DEVICE_VXLAN_PARENT,
                                                       "",
                                                       "",
@@ -565,12 +565,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:id:
-	 *
-	 * The device's VXLAN ID.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDeviceVxlan:id:
+     *
+     * The device's VXLAN ID.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_ID] = g_param_spec_uint(NM_DEVICE_VXLAN_ID,
                                                 "",
                                                 "",
@@ -580,14 +580,14 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                 G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:group:
-	 *
-	 * The unicast destination IP address used in outgoing packets when the
-	 * destination link layer address is not known in the VXLAN device
-	 * forwarding database or the multicast IP address joined.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:group:
+     *
+     * The unicast destination IP address used in outgoing packets when the
+     * destination link layer address is not known in the VXLAN device
+     * forwarding database or the multicast IP address joined.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_GROUP] = g_param_spec_string(NM_DEVICE_VXLAN_GROUP,
                                                      "",
                                                      "",
@@ -595,12 +595,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:local:
-	 *
-	 * The source IP address to use in outgoing packets.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:local:
+     *
+     * The source IP address to use in outgoing packets.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_LOCAL] = g_param_spec_string(NM_DEVICE_VXLAN_LOCAL,
                                                      "",
                                                      "",
@@ -608,12 +608,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:tos:
-	 *
-	 * The TOS value to use in outgoing packets.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:tos:
+     *
+     * The TOS value to use in outgoing packets.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_TOS] = g_param_spec_uchar(NM_DEVICE_VXLAN_TOS,
                                                   "",
                                                   "",
@@ -623,12 +623,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:ttl:
-	 *
-	 * The time-to-live value to use in outgoing packets.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:ttl:
+     *
+     * The time-to-live value to use in outgoing packets.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_TTL] = g_param_spec_uchar(NM_DEVICE_VXLAN_TTL,
                                                   "",
                                                   "",
@@ -638,13 +638,13 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:learning:
-	 *
-	 * Whether unknown source link layer addresses and IP addresses are entered
-	 * into the VXLAN device forwarding database.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:learning:
+     *
+     * Whether unknown source link layer addresses and IP addresses are entered
+     * into the VXLAN device forwarding database.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_LEARNING] = g_param_spec_boolean(NM_DEVICE_VXLAN_LEARNING,
                                                          "",
                                                          "",
@@ -652,12 +652,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:ageing:
-	 *
-	 * The lifetime in seconds of FDB entries learnt by the kernel.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:ageing:
+     *
+     * The lifetime in seconds of FDB entries learnt by the kernel.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_AGEING] = g_param_spec_uint(NM_DEVICE_VXLAN_AGEING,
                                                     "",
                                                     "",
@@ -667,12 +667,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:limit:
-	 *
-	 * The maximum number of entries that can be added to the forwarding table.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:limit:
+     *
+     * The maximum number of entries that can be added to the forwarding table.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_LIMIT] = g_param_spec_uint(NM_DEVICE_VXLAN_LIMIT,
                                                    "",
                                                    "",
@@ -682,13 +682,13 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:dst-port:
-	 *
-	 * The UDP destination port used to communicate with the remote VXLAN tunnel
-	 * endpoint.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:dst-port:
+     *
+     * The UDP destination port used to communicate with the remote VXLAN tunnel
+     * endpoint.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_DST_PORT] = g_param_spec_uint(NM_DEVICE_VXLAN_DST_PORT,
                                                       "",
                                                       "",
@@ -698,13 +698,13 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:src-port-min:
-	 *
-	 * The minimum UDP source port used to communicate with the remote VXLAN
-	 * tunnel endpoint.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:src-port-min:
+     *
+     * The minimum UDP source port used to communicate with the remote VXLAN
+     * tunnel endpoint.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_SRC_PORT_MIN] =
         g_param_spec_uint(NM_DEVICE_VXLAN_SRC_PORT_MIN,
                           "",
@@ -715,13 +715,13 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:src-port-max:
-	 *
-	 * The maximum UDP source port used to communicate with the remote VXLAN
-	 * tunnel endpoint.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:src-port-max:
+     *
+     * The maximum UDP source port used to communicate with the remote VXLAN
+     * tunnel endpoint.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_SRC_PORT_MAX] =
         g_param_spec_uint(NM_DEVICE_VXLAN_SRC_PORT_MAX,
                           "",
@@ -732,12 +732,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:proxy:
-	 *
-	 * Whether ARP proxy is turned on.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:proxy:
+     *
+     * Whether ARP proxy is turned on.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_PROXY] = g_param_spec_boolean(NM_DEVICE_VXLAN_PROXY,
                                                       "",
                                                       "",
@@ -745,12 +745,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:rsc:
-	 *
-	 * Whether route short circuit is turned on.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:rsc:
+     *
+     * Whether route short circuit is turned on.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_RSC] = g_param_spec_boolean(NM_DEVICE_VXLAN_RSC,
                                                     "",
                                                     "",
@@ -758,12 +758,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:l2miss:
-	 *
-	 * Whether netlink LL ADDR miss notifications are generated.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:l2miss:
+     *
+     * Whether netlink LL ADDR miss notifications are generated.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_L2MISS] = g_param_spec_boolean(NM_DEVICE_VXLAN_L2MISS,
                                                        "",
                                                        "",
@@ -771,12 +771,12 @@ nm_device_vxlan_class_init(NMDeviceVxlanClass *klass)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceVxlan:l3miss:
-	 *
-	 * Whether netlink IP ADDR miss notifications are generated.
-	 *
-	 * Since: 1.2
-	 */
+     * NMDeviceVxlan:l3miss:
+     *
+     * Whether netlink IP ADDR miss notifications are generated.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_L3MISS] = g_param_spec_boolean(NM_DEVICE_VXLAN_L3MISS,
                                                        "",
                                                        "",
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index e731ba4c6d..f9a42bb86e 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -357,12 +357,12 @@ nm_device_wifi_p2p_class_init(NMDeviceWifiP2PClass *klass)
     device_class->get_type_description  = get_type_description;
 
     /**
-	 * NMDeviceWifiP2P:peers: (type GPtrArray(NMWifiP2PPeer))
-	 *
-	 * List of all Wi-Fi P2P peers the device can see.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMDeviceWifiP2P:peers: (type GPtrArray(NMWifiP2PPeer))
+     *
+     * List of all Wi-Fi P2P peers the device can see.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_PEERS] = g_param_spec_boxed(NM_DEVICE_WIFI_P2P_PEERS,
                                                     "",
                                                     "",
@@ -373,14 +373,14 @@ nm_device_wifi_p2p_class_init(NMDeviceWifiP2PClass *klass)
                                               &_nml_dbus_meta_iface_nm_device_wifip2p);
 
     /**
-	 * NMDeviceWifiP2P::peer-added:
-	 * @device: the Wi-Fi P2P device that received the signal
-	 * @peer: the new access point
-	 *
-	 * Notifies that a #NMWifiP2PPeer is added to the Wi-Fi P2P device.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMDeviceWifiP2P::peer-added:
+     * @device: the Wi-Fi P2P device that received the signal
+     * @peer: the new access point
+     *
+     * Notifies that a #NMWifiP2PPeer is added to the Wi-Fi P2P device.
+     *
+     * Since: 1.16
+     **/
     signals[PEER_ADDED] = g_signal_new("peer-added",
                                        G_OBJECT_CLASS_TYPE(object_class),
                                        G_SIGNAL_RUN_FIRST,
@@ -393,14 +393,14 @@ nm_device_wifi_p2p_class_init(NMDeviceWifiP2PClass *klass)
                                        G_TYPE_OBJECT);
 
     /**
-	 * NMDeviceWifiP2P::peer-removed:
-	 * @device: the Wi-Fi P2P device that received the signal
-	 * @peer: the removed access point
-	 *
-	 * Notifies that a #NMWifiP2PPeer is removed from the Wi-Fi P2P device.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMDeviceWifiP2P::peer-removed:
+     * @device: the Wi-Fi P2P device that received the signal
+     * @peer: the removed access point
+     *
+     * Notifies that a #NMWifiP2PPeer is removed from the Wi-Fi P2P device.
+     *
+     * Since: 1.16
+     **/
     signals[PEER_REMOVED] = g_signal_new("peer-removed",
                                          G_OBJECT_CLASS_TYPE(object_class),
                                          G_SIGNAL_RUN_FIRST,
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 53c7d32a19..4abc83d80f 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -655,10 +655,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
     device_class->get_setting_type      = get_setting_type;
 
     /**
-	 * NMDeviceWifi:perm-hw-address:
-	 *
-	 * The hardware (MAC) address of the device.
-	 **/
+     * NMDeviceWifi:perm-hw-address:
+     *
+     * The hardware (MAC) address of the device.
+     **/
     obj_properties[PROP_PERM_HW_ADDRESS] =
         g_param_spec_string(NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS,
                             "",
@@ -667,10 +667,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:mode:
-	 *
-	 * The mode of the device.
-	 **/
+     * NMDeviceWifi:mode:
+     *
+     * The mode of the device.
+     **/
     obj_properties[PROP_MODE] = g_param_spec_enum(NM_DEVICE_WIFI_MODE,
                                                   "",
                                                   "",
@@ -679,10 +679,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                                                   G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:bitrate:
-	 *
-	 * The bit rate of the device in kbit/s.
-	 **/
+     * NMDeviceWifi:bitrate:
+     *
+     * The bit rate of the device in kbit/s.
+     **/
     obj_properties[PROP_BITRATE] = g_param_spec_uint(NM_DEVICE_WIFI_BITRATE,
                                                      "",
                                                      "",
@@ -692,10 +692,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:active-access-point:
-	 *
-	 * The active #NMAccessPoint of the device.
-	 **/
+     * NMDeviceWifi:active-access-point:
+     *
+     * The active #NMAccessPoint of the device.
+     **/
     obj_properties[PROP_ACTIVE_ACCESS_POINT] =
         g_param_spec_object(NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT,
                             "",
@@ -704,10 +704,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:wireless-capabilities:
-	 *
-	 * The wireless capabilities of the device.
-	 **/
+     * NMDeviceWifi:wireless-capabilities:
+     *
+     * The wireless capabilities of the device.
+     **/
     obj_properties[PROP_WIRELESS_CAPABILITIES] =
         g_param_spec_flags(NM_DEVICE_WIFI_CAPABILITIES,
                            "",
@@ -717,10 +717,10 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:access-points: (type GPtrArray(NMAccessPoint))
-	 *
-	 * List of all Wi-Fi access points the device can see.
-	 **/
+     * NMDeviceWifi:access-points: (type GPtrArray(NMAccessPoint))
+     *
+     * List of all Wi-Fi access points the device can see.
+     **/
     obj_properties[PROP_ACCESS_POINTS] =
         g_param_spec_boxed(NM_DEVICE_WIFI_ACCESS_POINTS,
                            "",
@@ -729,14 +729,14 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWifi:last-scan:
-	 *
-	 * The timestamp (in CLOCK_BOOTTIME seconds) for the last finished
-	 * network scan. A value of -1 means the device never scanned for
-	 * access points.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMDeviceWifi:last-scan:
+     *
+     * The timestamp (in CLOCK_BOOTTIME seconds) for the last finished
+     * network scan. A value of -1 means the device never scanned for
+     * access points.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_LAST_SCAN] = g_param_spec_int64(NM_DEVICE_WIFI_LAST_SCAN,
                                                         "",
                                                         "",
@@ -749,12 +749,12 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                                               &_nml_dbus_meta_iface_nm_device_wireless);
 
     /**
-	 * NMDeviceWifi::access-point-added:
-	 * @device: the Wi-Fi device that received the signal
-	 * @ap: the new access point
-	 *
-	 * Notifies that a #NMAccessPoint is added to the Wi-Fi device.
-	 **/
+     * NMDeviceWifi::access-point-added:
+     * @device: the Wi-Fi device that received the signal
+     * @ap: the new access point
+     *
+     * Notifies that a #NMAccessPoint is added to the Wi-Fi device.
+     **/
     signals[ACCESS_POINT_ADDED] = g_signal_new("access-point-added",
                                                G_OBJECT_CLASS_TYPE(object_class),
                                                G_SIGNAL_RUN_FIRST,
@@ -767,12 +767,12 @@ nm_device_wifi_class_init(NMDeviceWifiClass *klass)
                                                G_TYPE_OBJECT);
 
     /**
-	 * NMDeviceWifi::access-point-removed:
-	 * @device: the Wi-Fi device that received the signal
-	 * @ap: the removed access point
-	 *
-	 * Notifies that a #NMAccessPoint is removed from the Wi-Fi device.
-	 **/
+     * NMDeviceWifi::access-point-removed:
+     * @device: the Wi-Fi device that received the signal
+     * @ap: the removed access point
+     *
+     * Notifies that a #NMAccessPoint is removed from the Wi-Fi device.
+     **/
     signals[ACCESS_POINT_REMOVED] = g_signal_new("access-point-removed",
                                                  G_OBJECT_CLASS_TYPE(object_class),
                                                  G_SIGNAL_RUN_FIRST,
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index d47cc0f5f5..29e1b85cfc 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -224,12 +224,12 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
     object_class->get_property = get_property;
 
     /**
-	 * NMDeviceWimax:hw-address:
-	 *
-	 * The hardware (MAC) address of the device.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:hw-address:
+     *
+     * The hardware (MAC) address of the device.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_HW_ADDRESS] =
         g_param_spec_string(NM_DEVICE_WIMAX_HW_ADDRESS,
                             "",
@@ -238,12 +238,12 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:active-nsp:
-	 *
-	 * The active #NMWimaxNsp of the device.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:active-nsp:
+     *
+     * The active #NMWimaxNsp of the device.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_ACTIVE_NSP] =
         g_param_spec_object(NM_DEVICE_WIMAX_ACTIVE_NSP,
                             "",
@@ -252,14 +252,14 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:center-frequency:
-	 *
-	 * The center frequency (in KHz) of the radio channel the device is using to
-	 * communicate with the network when connected.  Has no meaning when the
-	 * device is not connected.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:center-frequency:
+     *
+     * The center frequency (in KHz) of the radio channel the device is using to
+     * communicate with the network when connected.  Has no meaning when the
+     * device is not connected.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_CENTER_FREQ] = g_param_spec_uint(NM_DEVICE_WIMAX_CENTER_FREQUENCY,
                                                          "",
                                                          "",
@@ -269,15 +269,15 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:rssi:
-	 *
-	 * RSSI of the current radio link in dBm.  This value indicates how strong
-	 * the raw received RF signal from the base station is, but does not
-	 * indicate the overall quality of the radio link.  Has no meaning when the
-	 * device is not connected.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:rssi:
+     *
+     * RSSI of the current radio link in dBm.  This value indicates how strong
+     * the raw received RF signal from the base station is, but does not
+     * indicate the overall quality of the radio link.  Has no meaning when the
+     * device is not connected.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_RSSI] = g_param_spec_int(NM_DEVICE_WIMAX_RSSI,
                                                  "",
                                                  "",
@@ -287,14 +287,14 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                                  G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:cinr:
-	 *
-	 * CINR (Carrier to Interference + Noise Ratio) of the current radio link
-	 * in dB.  CINR is a more accurate measure of radio link quality.  Has no
-	 * meaning when the device is not connected.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:cinr:
+     *
+     * CINR (Carrier to Interference + Noise Ratio) of the current radio link
+     * in dB.  CINR is a more accurate measure of radio link quality.  Has no
+     * meaning when the device is not connected.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_CINR] = g_param_spec_int(NM_DEVICE_WIMAX_CINR,
                                                  "",
                                                  "",
@@ -304,14 +304,14 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                                  G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:tx-power:
-	 *
-	 * Average power of the last burst transmitted by the device, in units of
-	 * 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
-	 * -5.5 dBm.  Has no meaning when the device is not connected.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:tx-power:
+     *
+     * Average power of the last burst transmitted by the device, in units of
+     * 0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+     * -5.5 dBm.  Has no meaning when the device is not connected.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_TX_POWER] = g_param_spec_int(NM_DEVICE_WIMAX_TX_POWER,
                                                      "",
                                                      "",
@@ -321,13 +321,13 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:bsid:
-	 *
-	 * The ID of the serving base station as received from the network.  Has
-	 * no meaning when the device is not connected.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax:bsid:
+     *
+     * The ID of the serving base station as received from the network.  Has
+     * no meaning when the device is not connected.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     obj_properties[PROP_BSID] = g_param_spec_string(NM_DEVICE_WIMAX_BSID,
                                                     "",
                                                     "",
@@ -335,10 +335,10 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWimax:nsps: (type GPtrArray(NMWimaxNsp))
-	 *
-	 * List of all WiMAX Network Service Providers the device can see.
-	 **/
+     * NMDeviceWimax:nsps: (type GPtrArray(NMWimaxNsp))
+     *
+     * List of all WiMAX Network Service Providers the device can see.
+     **/
     obj_properties[PROP_NSPS] = g_param_spec_boxed(NM_DEVICE_WIMAX_NSPS,
                                                    "",
                                                    "",
@@ -348,14 +348,14 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
     /**
-	 * NMDeviceWimax::nsp-added:
-	 * @self: the wimax device that received the signal
-	 * @nsp: the new NSP
-	 *
-	 * Notifies that a #NMWimaxNsp is added to the wimax device.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax::nsp-added:
+     * @self: the wimax device that received the signal
+     * @nsp: the new NSP
+     *
+     * Notifies that a #NMWimaxNsp is added to the wimax device.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     signals[NSP_ADDED] = g_signal_new("nsp-added",
                                       G_OBJECT_CLASS_TYPE(object_class),
                                       G_SIGNAL_RUN_FIRST,
@@ -368,14 +368,14 @@ nm_device_wimax_class_init(NMDeviceWimaxClass *wimax_class)
                                       G_TYPE_OBJECT);
 
     /**
-	 * NMDeviceWimax::nsp-removed:
-	 * @self: the wimax device that received the signal
-	 * @nsp: the removed NSP
-	 *
-	 * Notifies that a #NMWimaxNsp is removed from the wimax device.
-	 *
-	 * Deprecated: 1.2: WiMAX is no longer supported.
-	 **/
+     * NMDeviceWimax::nsp-removed:
+     * @self: the wimax device that received the signal
+     * @nsp: the removed NSP
+     *
+     * Notifies that a #NMWimaxNsp is removed from the wimax device.
+     *
+     * Deprecated: 1.2: WiMAX is no longer supported.
+     **/
     signals[NSP_REMOVED] = g_signal_new("nsp-removed",
                                         G_OBJECT_CLASS_TYPE(object_class),
                                         G_SIGNAL_RUN_FIRST,
diff --git a/libnm/nm-device-wireguard.c b/libnm/nm-device-wireguard.c
index 3af32d0c62..918819b2d3 100644
--- a/libnm/nm-device-wireguard.c
+++ b/libnm/nm-device-wireguard.c
@@ -152,12 +152,12 @@ nm_device_wireguard_class_init(NMDeviceWireGuardClass *wireguard_class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMDeviceWireGuard:public-key:
-	 *
-	 * 32-byte public key, derived from the current private key.
-	 *
-	 * Since: 1.14
-	 **/
+     * NMDeviceWireGuard:public-key:
+     *
+     * 32-byte public key, derived from the current private key.
+     *
+     * Since: 1.14
+     **/
     obj_properties[PROP_PUBLIC_KEY] = g_param_spec_boxed(NM_DEVICE_WIREGUARD_PUBLIC_KEY,
                                                          "",
                                                          "",
@@ -165,13 +165,13 @@ nm_device_wireguard_class_init(NMDeviceWireGuardClass *wireguard_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWireGuard:listen-port:
-	 *
-	 * Local UDP listen port.
-	 * Set to 0 to allow a random port to be chosen (default).
-	 *
-	 * Since: 1.14
-	 **/
+     * NMDeviceWireGuard:listen-port:
+     *
+     * Local UDP listen port.
+     * Set to 0 to allow a random port to be chosen (default).
+     *
+     * Since: 1.14
+     **/
     obj_properties[PROP_LISTEN_PORT] = g_param_spec_uint(NM_DEVICE_WIREGUARD_LISTEN_PORT,
                                                          "",
                                                          "",
@@ -181,14 +181,14 @@ nm_device_wireguard_class_init(NMDeviceWireGuardClass *wireguard_class)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDeviceWireGuard:fwmark:
-	 *
-	 * Optional firewall mark - see ip-rule(8).
-	 * Used when setting routing policy for outgoing encrypted packets.
-	 * Set to 0 to disable the mark (default).
-	 *
-	 * Since: 1.14
-	 **/
+     * NMDeviceWireGuard:fwmark:
+     *
+     * Optional firewall mark - see ip-rule(8).
+     * Used when setting routing policy for outgoing encrypted packets.
+     * Set to 0 to disable the mark (default).
+     *
+     * Since: 1.14
+     **/
     obj_properties[PROP_FWMARK] = g_param_spec_uint(NM_DEVICE_WIREGUARD_FWMARK,
                                                     "",
                                                     "",
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index d5713e085e..9c8219671f 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -190,9 +190,9 @@ _notify_update_prop_state_reason(NMClient *              client,
     guint32          reason    = NM_DEVICE_STATE_REASON_NONE;
 
     /* We ignore the "State" property and the "StateChanged" signal of the device.
-	 * This information is redundant to the "StateReason" property, and we rely
-	 * on that one alone. In the best case, the information is identical. If it
-	 * would not be, then we stick to the information from "StateReason" property. */
+     * This information is redundant to the "StateReason" property, and we rely
+     * on that one alone. In the best case, the information is identical. If it
+     * would not be, then we stick to the information from "StateReason" property. */
 
     if (value)
         g_variant_get(value, "(uu)", &new_state, &reason);
@@ -613,10 +613,10 @@ nm_device_class_init(NMDeviceClass *klass)
     klass->connection_compatible = connection_compatible;
 
     /**
-	 * NMDevice:interface:
-	 *
-	 * The interface of the device.
-	 **/
+     * NMDevice:interface:
+     *
+     * The interface of the device.
+     **/
     obj_properties[PROP_INTERFACE] = g_param_spec_string(NM_DEVICE_INTERFACE,
                                                          "",
                                                          "",
@@ -624,11 +624,11 @@ nm_device_class_init(NMDeviceClass *klass)
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:ip-interface:
-	 *
-	 * The IP interface of the device which should be used for all IP-related
-	 * operations like addressing and routing.
-	 **/
+     * NMDevice:ip-interface:
+     *
+     * The IP interface of the device which should be used for all IP-related
+     * operations like addressing and routing.
+     **/
     obj_properties[PROP_IP_INTERFACE] =
         g_param_spec_string(NM_DEVICE_IP_INTERFACE,
                             "",
@@ -637,10 +637,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:device-type:
-	 *
-	 * The numeric type of the device.
-	 **/
+     * NMDevice:device-type:
+     *
+     * The numeric type of the device.
+     **/
     obj_properties[PROP_DEVICE_TYPE] = g_param_spec_enum(NM_DEVICE_DEVICE_TYPE,
                                                          "",
                                                          "",
@@ -648,29 +648,29 @@ nm_device_class_init(NMDeviceClass *klass)
                                                          NM_DEVICE_TYPE_UNKNOWN,
                                                          G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
     /**
-	 * NMDevice:udi:
-	 *
-	 * An operating-system specific device hardware identifier; this is not
-	 * unique to a specific hardware device across reboots or hotplugs.  It
-	 * is an opaque string which for some device types (Bluetooth, Modem)
-	 * contains an identifier provided by the underlying hardware service daemon
-	 * such as Bluez or ModemManager, and clients can use this property to
-	 * request more information about the device from those services.
-	 **/
+     * NMDevice:udi:
+     *
+     * An operating-system specific device hardware identifier; this is not
+     * unique to a specific hardware device across reboots or hotplugs.  It
+     * is an opaque string which for some device types (Bluetooth, Modem)
+     * contains an identifier provided by the underlying hardware service daemon
+     * such as Bluez or ModemManager, and clients can use this property to
+     * request more information about the device from those services.
+     **/
     obj_properties[PROP_UDI] =
         g_param_spec_string(NM_DEVICE_UDI, "", "", NULL, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:path:
-	 *
-	 * The device path as exposed by the udev property ID_PATH.
-	 *
-	 * The string is backslash escaped (C escaping) for invalid
-	 * characters. The escaping can be reverted with g_strcompress(),
-	 * however the result may not be valid UTF-8.
-	 *
-	 * Since: 1.26
-	 **/
+     * NMDevice:path:
+     *
+     * The device path as exposed by the udev property ID_PATH.
+     *
+     * The string is backslash escaped (C escaping) for invalid
+     * characters. The escaping can be reverted with g_strcompress(),
+     * however the result may not be valid UTF-8.
+     *
+     * Since: 1.26
+     **/
     obj_properties[PROP_PATH] = g_param_spec_string(NM_DEVICE_PATH,
                                                     "",
                                                     "",
@@ -678,10 +678,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:driver:
-	 *
-	 * The driver of the device.
-	 **/
+     * NMDevice:driver:
+     *
+     * The driver of the device.
+     **/
     obj_properties[PROP_DRIVER] = g_param_spec_string(NM_DEVICE_DRIVER,
                                                       "",
                                                       "",
@@ -689,10 +689,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:driver-version:
-	 *
-	 * The version of the device driver.
-	 **/
+     * NMDevice:driver-version:
+     *
+     * The version of the device driver.
+     **/
     obj_properties[PROP_DRIVER_VERSION] =
         g_param_spec_string(NM_DEVICE_DRIVER_VERSION,
                             "",
@@ -701,10 +701,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:firmware-version:
-	 *
-	 * The firmware version of the device.
-	 **/
+     * NMDevice:firmware-version:
+     *
+     * The firmware version of the device.
+     **/
     obj_properties[PROP_FIRMWARE_VERSION] =
         g_param_spec_string(NM_DEVICE_FIRMWARE_VERSION,
                             "",
@@ -713,10 +713,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:capabilities:
-	 *
-	 * The capabilities of the device.
-	 **/
+     * NMDevice:capabilities:
+     *
+     * The capabilities of the device.
+     **/
     obj_properties[PROP_CAPABILITIES] =
         g_param_spec_flags(NM_DEVICE_CAPABILITIES,
                            "",
@@ -726,14 +726,14 @@ nm_device_class_init(NMDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:real:
-	 *
-	 * Whether the device is real or is a placeholder device that could
-	 * be created automatically by NetworkManager if one of its
-	 * #NMDevice:available-connections was activated.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDevice:real:
+     *
+     * Whether the device is real or is a placeholder device that could
+     * be created automatically by NetworkManager if one of its
+     * #NMDevice:available-connections was activated.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_REAL] = g_param_spec_boolean(NM_DEVICE_REAL,
                                                      "",
                                                      "",
@@ -741,10 +741,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:managed:
-	 *
-	 * Whether the device is managed by NetworkManager.
-	 **/
+     * NMDevice:managed:
+     *
+     * Whether the device is managed by NetworkManager.
+     **/
     obj_properties[PROP_MANAGED] = g_param_spec_boolean(NM_DEVICE_MANAGED,
                                                         "",
                                                         "",
@@ -752,12 +752,12 @@ nm_device_class_init(NMDeviceClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:autoconnect:
-	 *
-	 * Whether the device can auto-activate a connection.
-	 *
-	 * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
-	 **/
+     * NMDevice:autoconnect:
+     *
+     * Whether the device can auto-activate a connection.
+     *
+     * The property setter is a synchronous D-Bus call. This is deprecated since 1.22.
+     **/
     obj_properties[PROP_AUTOCONNECT] =
         g_param_spec_boolean(NM_DEVICE_AUTOCONNECT,
                              "",
@@ -766,11 +766,11 @@ nm_device_class_init(NMDeviceClass *klass)
                              G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:firmware-missing:
-	 *
-	 * When %TRUE indicates the device is likely missing firmware required
-	 * for its operation.
-	 **/
+     * NMDevice:firmware-missing:
+     *
+     * When %TRUE indicates the device is likely missing firmware required
+     * for its operation.
+     **/
     obj_properties[PROP_FIRMWARE_MISSING] =
         g_param_spec_boolean(NM_DEVICE_FIRMWARE_MISSING,
                              "",
@@ -779,13 +779,13 @@ nm_device_class_init(NMDeviceClass *klass)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:nm-plugin-missing:
-	 *
-	 * When %TRUE indicates that the NetworkManager plugin for the device
-	 * is not installed.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDevice:nm-plugin-missing:
+     *
+     * When %TRUE indicates that the NetworkManager plugin for the device
+     * is not installed.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_NM_PLUGIN_MISSING] =
         g_param_spec_boolean(NM_DEVICE_NM_PLUGIN_MISSING,
                              "",
@@ -794,10 +794,10 @@ nm_device_class_init(NMDeviceClass *klass)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:ip4-config:
-	 *
-	 * The #NMIP4Config of the device.
-	 **/
+     * NMDevice:ip4-config:
+     *
+     * The #NMIP4Config of the device.
+     **/
     obj_properties[PROP_IP4_CONFIG] =
         g_param_spec_object(NM_DEVICE_IP4_CONFIG,
                             "",
@@ -806,10 +806,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:dhcp4-config:
-	 *
-	 * The IPv4 #NMDhcpConfig of the device.
-	 **/
+     * NMDevice:dhcp4-config:
+     *
+     * The IPv4 #NMDhcpConfig of the device.
+     **/
     obj_properties[PROP_DHCP4_CONFIG] =
         g_param_spec_object(NM_DEVICE_DHCP4_CONFIG,
                             "",
@@ -818,10 +818,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:ip6-config:
-	 *
-	 * The IPv6 #NMIPConfig of the device.
-	 **/
+     * NMDevice:ip6-config:
+     *
+     * The IPv6 #NMIPConfig of the device.
+     **/
     obj_properties[PROP_IP6_CONFIG] =
         g_param_spec_object(NM_DEVICE_IP6_CONFIG,
                             "",
@@ -830,10 +830,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:dhcp6-config:
-	 *
-	 * The IPv6 #NMDhcpConfig of the device.
-	 **/
+     * NMDevice:dhcp6-config:
+     *
+     * The IPv6 #NMDhcpConfig of the device.
+     **/
     obj_properties[PROP_DHCP6_CONFIG] =
         g_param_spec_object(NM_DEVICE_DHCP6_CONFIG,
                             "",
@@ -842,12 +842,12 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:ip4-connectivity:
-	 *
-	 * The IPv4 connectivity state of the device.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMDevice:ip4-connectivity:
+     *
+     * The IPv4 connectivity state of the device.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_IP4_CONNECTIVITY] =
         g_param_spec_enum(NM_DEVICE_IP4_CONNECTIVITY,
                           "",
@@ -857,12 +857,12 @@ nm_device_class_init(NMDeviceClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:ip6-connectivity:
-	 *
-	 * The IPv6 connectivity state of the device.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMDevice:ip6-connectivity:
+     *
+     * The IPv6 connectivity state of the device.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_IP6_CONNECTIVITY] =
         g_param_spec_enum(NM_DEVICE_IP6_CONNECTIVITY,
                           "",
@@ -872,10 +872,10 @@ nm_device_class_init(NMDeviceClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:state:
-	 *
-	 * The state of the device.
-	 **/
+     * NMDevice:state:
+     *
+     * The state of the device.
+     **/
     obj_properties[PROP_STATE] = g_param_spec_enum(NM_DEVICE_STATE,
                                                    "",
                                                    "",
@@ -884,10 +884,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:state-reason:
-	 *
-	 * The reason for the device state.
-	 **/
+     * NMDevice:state-reason:
+     *
+     * The reason for the device state.
+     **/
     obj_properties[PROP_STATE_REASON] =
         g_param_spec_uint(NM_DEVICE_STATE_REASON,
                           "",
@@ -898,10 +898,10 @@ nm_device_class_init(NMDeviceClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:active-connection:
-	 *
-	 * The #NMActiveConnection object that "owns" this device during activation.
-	 **/
+     * NMDevice:active-connection:
+     *
+     * The #NMActiveConnection object that "owns" this device during activation.
+     **/
     obj_properties[PROP_ACTIVE_CONNECTION] =
         g_param_spec_object(NM_DEVICE_ACTIVE_CONNECTION,
                             "",
@@ -910,10 +910,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:available-connections: (type GPtrArray(NMRemoteConnection))
-	 *
-	 * The available connections of the device
-	 **/
+     * NMDevice:available-connections: (type GPtrArray(NMRemoteConnection))
+     *
+     * The available connections of the device
+     **/
     obj_properties[PROP_AVAILABLE_CONNECTIONS] =
         g_param_spec_boxed(NM_DEVICE_AVAILABLE_CONNECTIONS,
                            "",
@@ -922,10 +922,10 @@ nm_device_class_init(NMDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:vendor:
-	 *
-	 * The vendor string of the device.
-	 **/
+     * NMDevice:vendor:
+     *
+     * The vendor string of the device.
+     **/
     obj_properties[PROP_VENDOR] = g_param_spec_string(NM_DEVICE_VENDOR,
                                                       "",
                                                       "",
@@ -933,10 +933,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:product:
-	 *
-	 * The product string of the device.
-	 **/
+     * NMDevice:product:
+     *
+     * The product string of the device.
+     **/
     obj_properties[PROP_PRODUCT] = g_param_spec_string(NM_DEVICE_PRODUCT,
                                                        "",
                                                        "",
@@ -944,11 +944,11 @@ nm_device_class_init(NMDeviceClass *klass)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:physical-port-id:
-	 *
-	 * The physical port ID of the device. (See
-	 * nm_device_get_physical_port_id().)
-	 **/
+     * NMDevice:physical-port-id:
+     *
+     * The physical port ID of the device. (See
+     * nm_device_get_physical_port_id().)
+     **/
     obj_properties[PROP_PHYSICAL_PORT_ID] =
         g_param_spec_string(NM_DEVICE_PHYSICAL_PORT_ID,
                             "",
@@ -957,10 +957,10 @@ nm_device_class_init(NMDeviceClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:mtu:
-	 *
-	 * The MTU of the device.
-	 **/
+     * NMDevice:mtu:
+     *
+     * The MTU of the device.
+     **/
     obj_properties[PROP_MTU] = g_param_spec_uint(NM_DEVICE_MTU,
                                                  "",
                                                  "",
@@ -970,12 +970,12 @@ nm_device_class_init(NMDeviceClass *klass)
                                                  G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:metered:
-	 *
-	 * Whether the device is metered.
-	 *
-	 * Since: 1.2
-	 **/
+     * NMDevice:metered:
+     *
+     * Whether the device is metered.
+     *
+     * Since: 1.2
+     **/
     obj_properties[PROP_METERED] = g_param_spec_uint(NM_DEVICE_METERED,
                                                      "",
                                                      "",
@@ -985,10 +985,10 @@ nm_device_class_init(NMDeviceClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:lldp-neighbors:
-	 *
-	 * The LLDP neighbors.
-	 **/
+     * NMDevice:lldp-neighbors:
+     *
+     * The LLDP neighbors.
+     **/
     obj_properties[PROP_LLDP_NEIGHBORS] =
         g_param_spec_boxed(NM_DEVICE_LLDP_NEIGHBORS,
                            "",
@@ -997,12 +997,12 @@ nm_device_class_init(NMDeviceClass *klass)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:interface-flags:
-	 *
-	 * The interface flags.
-	 *
-	 * Since: 1.22
-	 **/
+     * NMDevice:interface-flags:
+     *
+     * The interface flags.
+     *
+     * Since: 1.22
+     **/
     obj_properties[PROP_INTERFACE_FLAGS] =
         g_param_spec_uint(NM_DEVICE_INTERFACE_FLAGS,
                           "",
@@ -1013,12 +1013,12 @@ nm_device_class_init(NMDeviceClass *klass)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDevice:hw-address:
-	 *
-	 * The hardware address of the device.
-	 *
-	 * Since: 1.24
-	 **/
+     * NMDevice:hw-address:
+     *
+     * The hardware address of the device.
+     *
+     * Since: 1.24
+     **/
     obj_properties[PROP_HW_ADDRESS] =
         g_param_spec_string(NM_DEVICE_HW_ADDRESS,
                             "",
@@ -1029,14 +1029,14 @@ nm_device_class_init(NMDeviceClass *klass)
     _nml_dbus_meta_class_init_with_properties(object_class, &_nml_dbus_meta_iface_nm_device);
 
     /**
-	 * NMDevice::state-changed:
-	 * @device: the device object that received the signal
-	 * @new_state: the new state of the device
-	 * @old_state: the previous state of the device
-	 * @reason: the reason describing the state change
-	 *
-	 * Notifies the state change of a #NMDevice.
-	 **/
+     * NMDevice::state-changed:
+     * @device: the device object that received the signal
+     * @new_state: the new state of the device
+     * @old_state: the previous state of the device
+     * @reason: the reason describing the state change
+     *
+     * Notifies the state change of a #NMDevice.
+     **/
     signals[STATE_CHANGED] = g_signal_new("state-changed",
                                           G_OBJECT_CLASS_TYPE(object_class),
                                           G_SIGNAL_RUN_FIRST,
@@ -1209,7 +1209,7 @@ nm_device_get_type_description(NMDevice *device)
     const char *     desc, *typename;
 
     /* BEWARE: this function should return the same value
-	 * as nm_device_get_type_description() in nm-core. */
+     * as nm_device_get_type_description() in nm-core. */
 
     g_return_val_if_fail(NM_IS_DEVICE(device), NULL);
 
@@ -1244,7 +1244,7 @@ _nm_device_notify_update_prop_hw_address(NMClient *              client,
 
     if (!is_new && priv->hw_address_is_new) {
         /* once the instance is marked to honor the new property, the
-		 * changed signal for the old variant gets ignored. */
+         * changed signal for the old variant gets ignored. */
         goto out;
     }
 
@@ -1260,8 +1260,8 @@ _nm_device_notify_update_prop_hw_address(NMClient *              client,
                           _nml_coerce_property_str_not_empty(g_variant_get_string(value, NULL)));
 
     /* always emit a changed signal here, even if "priv->hw_address" might be unchanged.
-	 * We want to emit the signal because we received a PropertiesChanged signal on D-Bus,
-	 * even if nothing actually changed. */
+     * We want to emit the signal because we received a PropertiesChanged signal on D-Bus,
+     * even if nothing actually changed. */
     changed = TRUE;
 
 out:
@@ -1772,8 +1772,8 @@ get_bus_name(NMDevice *device)
         priv->bus_name = g_strdup(_("USB"));
     else {
         /* Use "" instead of NULL so we can tell later that we've
-		 * already tried.
-		 */
+         * already tried.
+         */
         priv->bus_name = g_strdup("");
     }
     udev_device_unref(udevice);
@@ -1812,8 +1812,8 @@ _get_udev_property(NMDevice *  device,
             return NULL;
     }
     /* Walk up the chain of the device and its parents a few steps to grab
-	 * vendor and device ID information off it.
-	 */
+     * vendor and device ID information off it.
+     */
     tmpdev = udev_device;
     while ((count++ < 3) && tmpdev && !enc_value) {
         if (!enc_value)
@@ -1827,7 +1827,7 @@ _get_udev_property(NMDevice *  device,
     udev_device_unref(udev_device);
 
     /* Prefer the hwdata database value over what comes directly
-	 * from the device. */
+     * from the device. */
     if (db_value) {
         g_free(enc_value);
         return db_value;
@@ -1940,8 +1940,8 @@ ensure_description(NMDevice *device)
         short_product = g_strdup(get_type_name(device));
 
     /* Another quick hack; if all of the fixed up vendor string
-	 * is found in product, ignore the vendor.
-	 */
+     * is found in product, ignore the vendor.
+     */
     {
         gs_free char *pdown = g_ascii_strdown(short_product, -1);
         gs_free char *vdown = g_ascii_strdown(priv->short_vendor, -1);
@@ -2040,8 +2040,8 @@ nm_device_disambiguate_names(NMDevice **devices, int num_devices)
         goto done;
 
     /* Try specific names (eg, "Ethernet" and "InfiniBand" rather
-	 * than "Wired")
-	 */
+     * than "Wired")
+     */
     for (i = 0; i < num_devices; i++) {
         if (duplicates[i]) {
             g_free(names[i]);
@@ -2063,11 +2063,11 @@ nm_device_disambiguate_names(NMDevice **devices, int num_devices)
             g_free(names[i]);
             name = get_device_type_name_with_iface(devices[i]);
             /* TRANSLATORS: the first %s is a bus name (eg, "USB") or
-			 * product name, the second is a device type (eg,
-			 * "Ethernet"). You can change this to something like
-			 * "%2$s (%1$s)" if there's no grammatical way to combine
-			 * the strings otherwise.
-			 */
+             * product name, the second is a device type (eg,
+             * "Ethernet"). You can change this to something like
+             * "%2$s (%1$s)" if there's no grammatical way to combine
+             * the strings otherwise.
+             */
             names[i] = g_strdup_printf(C_("long device name", "%s %s"), bus, name);
             g_free(name);
         }
@@ -2095,8 +2095,8 @@ nm_device_disambiguate_names(NMDevice **devices, int num_devices)
         goto done;
 
     /* If dealing with Bluetooth devices, try to distinguish them by
-	 * device name.
-	 */
+     * device name.
+     */
     for (i = 0; i < num_devices; i++) {
         if (duplicates[i] && NM_IS_DEVICE_BT(devices[i])) {
             const char *devname = nm_device_bt_get_name(NM_DEVICE_BT(devices[i]));
@@ -2115,8 +2115,8 @@ nm_device_disambiguate_names(NMDevice **devices, int num_devices)
         goto done;
 
     /* We have multiple identical network cards, so we have to differentiate
-	 * them by interface name.
-	 */
+     * them by interface name.
+     */
     for (i = 0; i < num_devices; i++) {
         if (duplicates[i]) {
             const char *interface = nm_device_get_iface(devices[i]);
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index 5b57d2b194..a8f46120a2 100644
--- a/libnm/nm-dhcp-config.c
+++ b/libnm/nm-dhcp-config.c
@@ -132,11 +132,11 @@ nm_dhcp_config_class_init(NMDhcpConfigClass *config_class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMDhcpConfig:family:
-	 *
-	 * The IP address family of the configuration; either
-	 * <literal>AF_INET</literal> or <literal>AF_INET6</literal>.
-	 **/
+     * NMDhcpConfig:family:
+     *
+     * The IP address family of the configuration; either
+     * <literal>AF_INET</literal> or <literal>AF_INET6</literal>.
+     **/
     obj_properties[PROP_FAMILY] = g_param_spec_int(NM_DHCP_CONFIG_FAMILY,
                                                    "",
                                                    "",
@@ -146,10 +146,10 @@ nm_dhcp_config_class_init(NMDhcpConfigClass *config_class)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMDhcpConfig:options: (type GHashTable(utf8,utf8)):
-	 *
-	 * The #GHashTable containing options of the configuration.
-	 **/
+     * NMDhcpConfig:options: (type GHashTable(utf8,utf8)):
+     *
+     * The #GHashTable containing options of the configuration.
+     **/
     obj_properties[PROP_OPTIONS] = g_param_spec_boxed(NM_DHCP_CONFIG_OPTIONS,
                                                       "",
                                                       "",
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index ddbe728c83..bb86431ef2 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -406,11 +406,11 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMIPConfig:family:
-	 *
-	 * The IP address family of the configuration; either
-	 * <literal>AF_INET</literal> or <literal>AF_INET6</literal>.
-	 **/
+     * NMIPConfig:family:
+     *
+     * The IP address family of the configuration; either
+     * <literal>AF_INET</literal> or <literal>AF_INET6</literal>.
+     **/
     obj_properties[PROP_FAMILY] = g_param_spec_int(NM_IP_CONFIG_FAMILY,
                                                    "",
                                                    "",
@@ -420,10 +420,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:gateway:
-	 *
-	 * The IP gateway address of the configuration as string.
-	 **/
+     * NMIPConfig:gateway:
+     *
+     * The IP gateway address of the configuration as string.
+     **/
     obj_properties[PROP_GATEWAY] = g_param_spec_string(NM_IP_CONFIG_GATEWAY,
                                                        "",
                                                        "",
@@ -431,10 +431,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:addresses:
-	 *
-	 * A #GPtrArray containing the addresses (#NMIPAddress) of the configuration.
-	 **/
+     * NMIPConfig:addresses:
+     *
+     * A #GPtrArray containing the addresses (#NMIPAddress) of the configuration.
+     **/
     obj_properties[PROP_ADDRESSES] = g_param_spec_boxed(NM_IP_CONFIG_ADDRESSES,
                                                         "",
                                                         "",
@@ -442,10 +442,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:routes: (type GPtrArray(NMIPRoute))
-	 *
-	 * A #GPtrArray containing the routes (#NMIPRoute) of the configuration.
-	 **/
+     * NMIPConfig:routes: (type GPtrArray(NMIPRoute))
+     *
+     * A #GPtrArray containing the routes (#NMIPRoute) of the configuration.
+     **/
     obj_properties[PROP_ROUTES] = g_param_spec_boxed(NM_IP_CONFIG_ROUTES,
                                                      "",
                                                      "",
@@ -453,10 +453,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:nameservers:
-	 *
-	 * The array containing name server IP addresses of the configuration.
-	 **/
+     * NMIPConfig:nameservers:
+     *
+     * The array containing name server IP addresses of the configuration.
+     **/
     obj_properties[PROP_NAMESERVERS] =
         g_param_spec_boxed(NM_IP_CONFIG_NAMESERVERS,
                            "",
@@ -465,10 +465,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                            G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:domains:
-	 *
-	 * The array containing domain strings of the configuration.
-	 **/
+     * NMIPConfig:domains:
+     *
+     * The array containing domain strings of the configuration.
+     **/
     obj_properties[PROP_DOMAINS] = g_param_spec_boxed(NM_IP_CONFIG_DOMAINS,
                                                       "",
                                                       "",
@@ -476,10 +476,10 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:searches:
-	 *
-	 * The array containing DNS search strings of the configuration.
-	 **/
+     * NMIPConfig:searches:
+     *
+     * The array containing DNS search strings of the configuration.
+     **/
     obj_properties[PROP_SEARCHES] = g_param_spec_boxed(NM_IP_CONFIG_SEARCHES,
                                                        "",
                                                        "",
@@ -487,11 +487,11 @@ nm_ip_config_class_init(NMIPConfigClass *config_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMIPConfig:wins-servers:
-	 *
-	 * The array containing WINS server IP addresses of the configuration.
-	 * (This will always be empty for IPv6 configurations.)
-	 **/
+     * NMIPConfig:wins-servers:
+     *
+     * The array containing WINS server IP addresses of the configuration.
+     * (This will always be empty for IPv6 configurations.)
+     **/
     obj_properties[PROP_WINS_SERVERS] =
         g_param_spec_boxed(NM_IP_CONFIG_WINS_SERVERS,
                            "",
diff --git a/libnm/nm-libnm-aux/nm-libnm-aux.c b/libnm/nm-libnm-aux/nm-libnm-aux.c
index 4c6dc0671c..1efefe2048 100644
--- a/libnm/nm-libnm-aux/nm-libnm-aux.c
+++ b/libnm/nm-libnm-aux/nm-libnm-aux.c
@@ -97,10 +97,10 @@ nmc_client_new_waitsync(GCancellable *cancellable,
 
 #if NM_MORE_ASSERTS > 10
     /* The sync initialization of NMClient is generally a bad idea, because it
-	 * brings the overhead of an additional GMainContext. Anyway, since our own
-	 * code no longer uses that, we hardly test those code paths. But they should
-	 * work just the same. Randomly use instead the sync initialization in a debug
-	 * build... */
+     * brings the overhead of an additional GMainContext. Anyway, since our own
+     * code no longer uses that, we hardly test those code paths. But they should
+     * work just the same. Randomly use instead the sync initialization in a debug
+     * build... */
     if ((g_random_int() % 2) == 0) {
         gboolean success;
 
@@ -109,7 +109,7 @@ nmc_client_new_waitsync(GCancellable *cancellable,
         va_end(ap);
 
         /* iterate the context at least once, just so that the behavior from POV of the
-		 * caller is roughly the same. */
+         * caller is roughly the same. */
         g_main_context_iteration(nm_client_get_main_context(nmc), FALSE);
 
         success = g_initable_init(G_INITABLE(nmc), cancellable, error);
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
index 51b7ce6fc1..21df8c86b4 100644
--- a/libnm/nm-libnm-utils.c
+++ b/libnm/nm-libnm-utils.c
@@ -48,8 +48,8 @@ _nml_dbus_log(NMLDBusLogLevel level, gboolean use_stdout, const char *fmt, ...)
     gint64          ts;
 
     /* we only call _nml_dbus_log() after nml_dbus_log_enabled(), which already does
-	 * an atomic access to the variable. Since the value is only initialized once and
-	 * never changes, we can just access it without additional locking. */
+     * an atomic access to the variable. Since the value is only initialized once and
+     * never changes, we can just access it without additional locking. */
     configured_log_level = _nml_dbus_log_level;
 
     nm_assert(level & configured_log_level);
@@ -172,16 +172,16 @@ _fixup_string(const char *       desc,
             const char *eow = &p[strlen(ignored_phrases[i])];
 
             /* require that the phrase is delimited by space, or
-			 * at the beginning or end of the description. */
+             * at the beginning or end of the description. */
             if ((p == desc_full || p[-1] == ' ') && NM_IN_SET(eow[0], '\0', ' '))
                 memmove(p, eow, strlen(eow) + 1); /* +1 for the \0 */
         }
     }
 
     /* Attempt to shorten ID by ignoring certain individual words.
-	 * - word-split the description at spaces
-	 * - coalesce multiple spaces
-	 * - skip over ignored_words */
+     * - word-split the description at spaces
+     * - coalesce multiple spaces
+     * - skip over ignored_words */
     p = desc_full;
     q = desc_full;
     for (;;) {
@@ -222,12 +222,12 @@ next:
     p = strchr(desc_full, '[');
     if (p == desc_full) {
         /* All we're left with is in square brackets.
-		 * Always prefer that to a blank string.*/
+         * Always prefer that to a blank string.*/
         square_brackets_sensible = TRUE;
     }
     if (square_brackets_sensible) {
         /* If there's a [<string>] that survived the substitution, then the string
-		 * is a short form that is generally preferable. */
+         * is a short form that is generally preferable. */
         q = strchr(desc_full, ']');
         if (p && q > p) {
             p++;
@@ -236,7 +236,7 @@ next:
         }
     } else {
         /* [<string>] sometimes contains the preferred human-readable name, but
-		 * mostly it's utterly useless. Sigh. Drop it. */
+         * mostly it's utterly useless. Sigh. Drop it. */
         if (p) {
             if (p > desc_full && p[-1] == ' ')
                 p--;
@@ -736,9 +736,9 @@ nml_dbus_meta_iface_get(const char *dbus_iface_name)
     G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMLDBusMetaIface, dbus_iface_name) == 0);
 
     /* we assume that NetworkManager only uses unique interface names. E.g. one
-	 * interface name always has one particular meaning (and offers one set of
-	 * properties, signals and methods). This is a convenient assumption, and
-	 * we sure would never violate it when extending NM's D-Bus API. */
+     * interface name always has one particular meaning (and offers one set of
+     * properties, signals and methods). This is a convenient assumption, and
+     * we sure would never violate it when extending NM's D-Bus API. */
 
     if (NM_STR_HAS_PREFIX(dbus_iface_name, COMMON_PREFIX)) {
         /* optimize, that in fact all our interfaces have the same prefix. */
@@ -866,6 +866,6 @@ nm_utils_g_param_spec_is_default(const GParamSpec *pspec)
     }
 
     /* This function is only used for asserting/testing. It thus
-	 * strictly asserts and only support argument types that we expect. */
+     * strictly asserts and only support argument types that we expect. */
     g_return_val_if_reached(FALSE);
 }
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 2f29977263..e7d1d9650f 100644
--- a/libnm/nm-libnm-utils.h
+++ b/libnm/nm-libnm-utils.h
@@ -34,18 +34,18 @@ typedef enum {
     _NML_DBUS_LOG_LEVEL_DEBUG = 0x04,
 
     /* the difference between a warning and a critical is that it results in
-	 * g_warning() vs. g_critical() messages. Note that we want to use "warnings"
-	 * for unknown D-Bus API that could just result because we run against a
-	 * newer NetworkManager version (such warnings are more graceful, because
-	 * we want that libnm can be forward compatible against newer servers).
-	 * Critical warnings should be emitted when NetworkManager exposes something
-	 * on D-Bus that breaks the current expectations. Usually NetworkManager
-	 * should not break API, hence such issues are more severe. */
+     * g_warning() vs. g_critical() messages. Note that we want to use "warnings"
+     * for unknown D-Bus API that could just result because we run against a
+     * newer NetworkManager version (such warnings are more graceful, because
+     * we want that libnm can be forward compatible against newer servers).
+     * Critical warnings should be emitted when NetworkManager exposes something
+     * on D-Bus that breaks the current expectations. Usually NetworkManager
+     * should not break API, hence such issues are more severe. */
     _NML_DBUS_LOG_LEVEL_WARN  = 0x08,
     _NML_DBUS_LOG_LEVEL_ERROR = 0x10,
 
     /* ANY is only relevant for nml_dbus_log_enabled() to check whether any of the
-	 * options is on. */
+     * options is on. */
     NML_DBUS_LOG_LEVEL_ANY = _NML_DBUS_LOG_LEVEL_INITIALIZED,
 
     NML_DBUS_LOG_LEVEL_TRACE = _NML_DBUS_LOG_LEVEL_TRACE,
@@ -218,8 +218,8 @@ typedef struct _NMLDBusPropertyAO NMLDBusPropertyAO;
 
 typedef enum {
     /* See comments below for NMLDBusMetaIface.interface_prio.
-	 *
-	 * Higher numbers means more important to detect the GObject type. */
+     *
+     * Higher numbers means more important to detect the GObject type. */
     NML_DBUS_META_INTERFACE_PRIO_NONE             = 0,
     NML_DBUS_META_INTERFACE_PRIO_NMCLIENT         = 1,
     NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE      = 2,
@@ -235,8 +235,8 @@ typedef struct {
     GType (*get_o_type_fcn)(void);
 
     /* Ignore whether the referenced NMObject is ready or not. That means,
-	 * the property is always ready (and if the pointed object itself is
-	 * not yet ready, the property pretends to be %NULL for the moment. */
+     * the property is always ready (and if the pointed object itself is
+     * not yet ready, the property pretends to be %NULL for the moment. */
     bool is_always_ready : 1;
 
 } NMLDBusPropertVTableO;
@@ -277,8 +277,8 @@ typedef struct {
     gboolean (*check_nmobj_visible_fcn)(GObject *nmobj);
 
     /* Ignore whether the referenced NMObject is ready or not. That means,
-	 * the property is always ready (and if the pointed object itself is
-	 * not yet ready, the property pretends to be %NULL for the moment. */
+     * the property is always ready (and if the pointed object itself is
+     * not yet ready, the property pretends to be %NULL for the moment. */
     bool is_always_ready : 1;
 
 } NMLDBusPropertVTableAO;
@@ -463,16 +463,16 @@ struct _NMLDBusMetaIface {
     GType (*get_type_fcn)(void);
 
     /* Usually there is a one-to-one correspondence between the properties
-	 * on D-Bus (dbus_properties) and the GObject properties (obj_properties).
-	 *
-	 * With:
-	 *     meta_iface->obj_properties[o_idx]    (o_idx < n_obj_properties)
-	 *     &meta_iface->dbus_properties[d_idx]  (d_idx < n_dbus_properties)
-	 * it follows that
-	 *     assert (meta_iface->obj_properties_reverse_idx[o_idx] == d_idx)
-	 *     assert (meta_iface->dbus_properties[d_idx].obj_properties_idx == o_idx)
-	 * if (and only if) two properties correspond.
-	 */
+     * on D-Bus (dbus_properties) and the GObject properties (obj_properties).
+     *
+     * With:
+     *     meta_iface->obj_properties[o_idx]    (o_idx < n_obj_properties)
+     *     &meta_iface->dbus_properties[d_idx]  (d_idx < n_dbus_properties)
+     * it follows that
+     *     assert (meta_iface->obj_properties_reverse_idx[o_idx] == d_idx)
+     *     assert (meta_iface->dbus_properties[d_idx].obj_properties_idx == o_idx)
+     * if (and only if) two properties correspond.
+     */
     const GParamSpec *const *  obj_properties;
     const NMLDBusMetaProperty *dbus_properties;
     const guint8 *             obj_properties_reverse_idx;
@@ -481,51 +481,51 @@ struct _NMLDBusMetaIface {
     guint8 n_obj_properties;
 
     /* The offsets "prop_struct_offset" in NMLDBusMetaProperty are based on some base
-	 * struct. If "base_struct_offset" is 0, then the base struct is the GObject pointer
-	 * itself.
-	 * If this is non-null, then we expect at that location a pointer to the offset.
-	 * In this case we need to first find the base pointer via
-	 *   *((gpointer *) ((char *) nmobj + meta_iface->base_struct_offset)).
-	 *
-	 * This covers NMDeviceBridge._priv vs. NMDevice._priv. In the second case,
-	 * _priv is a pointer that we first need to follow.
-	 */
+     * struct. If "base_struct_offset" is 0, then the base struct is the GObject pointer
+     * itself.
+     * If this is non-null, then we expect at that location a pointer to the offset.
+     * In this case we need to first find the base pointer via
+     *   *((gpointer *) ((char *) nmobj + meta_iface->base_struct_offset)).
+     *
+     * This covers NMDeviceBridge._priv vs. NMDevice._priv. In the second case,
+     * _priv is a pointer that we first need to follow.
+     */
     guint8 base_struct_offset;
 
     /* We create the appropriate NMObject GType based on the D-Bus interfaces that
-	 * are present. For example, if we see a "org.freedesktop.NetworkManager.Device.Bridge"
-	 * interface, we create a NMDeviceBridge. Basically, if it looks like a certain
-	 * object (based on the D-Bus interface), we assume it is.
-	 *
-	 * Some interfaces are purely additional ("org.freedesktop.NetworkManager.Device.Statistics")
-	 * and don't determine the NMObject type (%NML_DBUS_META_INTERFACE_PRIO_NONE).
-	 *
-	 * Some interfaces are of a parent type ("org.freedesktop.NetworkManager.Device" for
-	 * NMDevice), and don't determine the type either (%NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE).
-	 *
-	 * Some interfaces ("org.freedesktop.NetworkManager.AgentManager") belong to NMClient
-	 * itself. Those have priority %NML_DBUS_META_INTERFACE_PRIO_NMCLIENT.
-	 *
-	 * In most cases, each D-Bus object is expected to have only one D-Bus interface
-	 * to determine the type. While theoretically an object
-	 * "/org/freedesktop/NetworkManager/Devices/3" could have interfaces "org.freedesktop.NetworkManager.Device.Bridge"
-	 * and "org.freedesktop.NetworkManager.Device.Bond" at the same time, in practice it doesn't.
-	 * Note that we also assume that once a D-Bus object gets a NMObject, it cannot change (*).
-	 * NetworkManager's API does not add/remove interfaces after exporting the object the
-	 * first time, so in practice each D-Bus object is expected to have a suitable D-Bus
-	 * interface (and only determining interface, which doesn't change). Those interfaces have
-	 * priority %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH.
-	 *
-	 * (*) note that nothing bad would happen if a faulty NetworkManager would violate that.
-	 * Of course, something would not work correctly, but the D-Bus interface we find is unexpected
-	 * and wrong.
-	 *
-	 * One exception is "org.freedesktop.NetworkManager.Connection.Active". This can either
-	 * be a NMActiveConnection or a NMVpnConnection. Hence, this profile has priority
-	 * %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW, and depending on whether there is
-	 * a "org.freedesktop.NetworkManager.VPN.Connection" (with high priority), we create
-	 * one or the other type.
-	 */
+     * are present. For example, if we see a "org.freedesktop.NetworkManager.Device.Bridge"
+     * interface, we create a NMDeviceBridge. Basically, if it looks like a certain
+     * object (based on the D-Bus interface), we assume it is.
+     *
+     * Some interfaces are purely additional ("org.freedesktop.NetworkManager.Device.Statistics")
+     * and don't determine the NMObject type (%NML_DBUS_META_INTERFACE_PRIO_NONE).
+     *
+     * Some interfaces are of a parent type ("org.freedesktop.NetworkManager.Device" for
+     * NMDevice), and don't determine the type either (%NML_DBUS_META_INTERFACE_PRIO_PARENT_TYPE).
+     *
+     * Some interfaces ("org.freedesktop.NetworkManager.AgentManager") belong to NMClient
+     * itself. Those have priority %NML_DBUS_META_INTERFACE_PRIO_NMCLIENT.
+     *
+     * In most cases, each D-Bus object is expected to have only one D-Bus interface
+     * to determine the type. While theoretically an object
+     * "/org/freedesktop/NetworkManager/Devices/3" could have interfaces "org.freedesktop.NetworkManager.Device.Bridge"
+     * and "org.freedesktop.NetworkManager.Device.Bond" at the same time, in practice it doesn't.
+     * Note that we also assume that once a D-Bus object gets a NMObject, it cannot change (*).
+     * NetworkManager's API does not add/remove interfaces after exporting the object the
+     * first time, so in practice each D-Bus object is expected to have a suitable D-Bus
+     * interface (and only determining interface, which doesn't change). Those interfaces have
+     * priority %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_HIGH.
+     *
+     * (*) note that nothing bad would happen if a faulty NetworkManager would violate that.
+     * Of course, something would not work correctly, but the D-Bus interface we find is unexpected
+     * and wrong.
+     *
+     * One exception is "org.freedesktop.NetworkManager.Connection.Active". This can either
+     * be a NMActiveConnection or a NMVpnConnection. Hence, this profile has priority
+     * %NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_LOW, and depending on whether there is
+     * a "org.freedesktop.NetworkManager.VPN.Connection" (with high priority), we create
+     * one or the other type.
+     */
     NMLDBusMetaInteracePrio interface_prio : 3;
 };
 
@@ -632,22 +632,22 @@ struct _NMLDBusObject {
     NMRefString *dbus_path;
 
     /* While the object is tracked by NMClient, it is linked with this list.
-	 * The lists are partitioned based on the NMLDBusObjState. */
+     * The lists are partitioned based on the NMLDBusObjState. */
     CList dbus_objects_lst;
 
     /* The list of D-Bus interface NMLDBusObjIfaceData.
-	 *
-	 * Some may be about to be removed (iface_removed) or
-	 * unknown (!dbus_iface_is_wellknown). */
+     *
+     * Some may be about to be removed (iface_removed) or
+     * unknown (!dbus_iface_is_wellknown). */
     CList iface_lst_head;
 
     /* The list of registered NMLDBusObjWatcher. */
     CList watcher_lst_head;
 
     /* When an object changes (e.g. because of new information on D-Bus), we often
-	 * don't process the changes right away, but enqueue the object in a changed
-	 * list. This list goes together with obj_changed_type property below, which
-	 * tracks what changed. */
+     * don't process the changes right away, but enqueue the object in a changed
+     * list. This list goes together with obj_changed_type property below, which
+     * tracks what changed. */
     CList obj_changed_lst;
 
     GObject *nmobj;
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 356a2bde04..9de12e639b 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -287,10 +287,10 @@ nm_object_class_init(NMObjectClass *klass)
     klass->obj_changed_notify = obj_changed_notify;
 
     /**
-	 * NMObject:path:
-	 *
-	 * The D-Bus object path.
-	 **/
+     * NMObject:path:
+     *
+     * The D-Bus object path.
+     **/
     obj_properties[PROP_PATH] = g_param_spec_string(NM_OBJECT_PATH,
                                                     "",
                                                     "",
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 2b442add99..3a5524fade 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -772,11 +772,11 @@ nm_remote_connection_class_init(NMRemoteConnectionClass *klass)
     nm_object_class->unregister_client = unregister_client;
 
     /**
-	 * NMRemoteConnection:unsaved:
-	 *
-	 * %TRUE if the remote connection contains changes that have not been saved
-	 * to disk, %FALSE if the connection is the same as its on-disk representation.
-	 **/
+     * NMRemoteConnection:unsaved:
+     *
+     * %TRUE if the remote connection contains changes that have not been saved
+     * to disk, %FALSE if the connection is the same as its on-disk representation.
+     **/
     obj_properties[PROP_UNSAVED] = g_param_spec_boolean(NM_REMOTE_CONNECTION_UNSAVED,
                                                         "",
                                                         "",
@@ -784,13 +784,13 @@ nm_remote_connection_class_init(NMRemoteConnectionClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMRemoteConnection:flags:
-	 *
-	 * The flags of the connection as unsigned integer. The values
-	 * correspond to the #NMSettingsConnectionFlags enum.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMRemoteConnection:flags:
+     *
+     * The flags of the connection as unsigned integer. The values
+     * correspond to the #NMSettingsConnectionFlags enum.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_FLAGS] = g_param_spec_uint(NM_REMOTE_CONNECTION_FLAGS,
                                                    "",
                                                    "",
@@ -800,13 +800,13 @@ nm_remote_connection_class_init(NMRemoteConnectionClass *klass)
                                                    G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMRemoteConnection:filename:
-	 *
-	 * File that stores the connection in case the connection is
-	 * file-backed.
-	 *
-	 * Since: 1.12
-	 **/
+     * NMRemoteConnection:filename:
+     *
+     * File that stores the connection in case the connection is
+     * file-backed.
+     *
+     * Since: 1.12
+     **/
     obj_properties[PROP_FILENAME] = g_param_spec_string(NM_REMOTE_CONNECTION_FILENAME,
                                                         "",
                                                         "",
@@ -814,16 +814,16 @@ nm_remote_connection_class_init(NMRemoteConnectionClass *klass)
                                                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMRemoteConnection:visible:
-	 *
-	 * %TRUE if the remote connection is visible to the current user, %FALSE if
-	 * not.  If the connection is not visible then it is essentially useless; it
-	 * will not contain any settings, and operations such as
-	 * nm_remote_connection_save() and nm_remote_connection_delete() will always
-	 * fail. (#NMRemoteSettings will not normally return non-visible connections
-	 * to callers, but it is possible for a connection's visibility to change
-	 * after you already have a reference to it.)
-	 **/
+     * NMRemoteConnection:visible:
+     *
+     * %TRUE if the remote connection is visible to the current user, %FALSE if
+     * not.  If the connection is not visible then it is essentially useless; it
+     * will not contain any settings, and operations such as
+     * nm_remote_connection_save() and nm_remote_connection_delete() will always
+     * fail. (#NMRemoteSettings will not normally return non-visible connections
+     * to callers, but it is possible for a connection's visibility to change
+     * after you already have a reference to it.)
+     **/
     obj_properties[PROP_VISIBLE] = g_param_spec_boolean(NM_REMOTE_CONNECTION_VISIBLE,
                                                         "",
                                                         "",
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 57d0628139..4cc47bb133 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -80,11 +80,11 @@ typedef struct {
     bool registration_force_unregister : 1;
 
     /* This is true, if we either are in the process of RegisterWithCapabilities() or
-	 * are already successfully registered.
-	 *
-	 * This is only TRUE, if the name owner was authenticated to run as root user.
-	 *
-	 * It also means, we should follow up with an Unregister() call during shutdown. */
+     * are already successfully registered.
+     *
+     * This is only TRUE, if the name owner was authenticated to run as root user.
+     *
+     * It also means, we should follow up with an Unregister() call during shutdown. */
     bool registered_against_server : 1;
 
     bool is_initialized : 1;
@@ -723,16 +723,16 @@ nm_secret_agent_old_register(NMSecretAgentOld *self, GCancellable *cancellable,
         return FALSE;
 
     /* This is a synchronous function, meaning: we are not allowed to iterate
-	 * the caller's GMainContext. This is a catch 22, because we don't want
-	 * to perform synchronous calls that bypasses the ordering of our otherwise
-	 * asynchronous mode of operation. Hence, we always signal success.
-	 * That's why this function is deprecated.
-	 *
-	 * So despite claiming success, we might still be in the process of registering
-	 * or NetworkManager might not be available.
-	 *
-	 * This is a change in behavior with respect to libnm before 1.24.
-	 */
+     * the caller's GMainContext. This is a catch 22, because we don't want
+     * to perform synchronous calls that bypasses the ordering of our otherwise
+     * asynchronous mode of operation. Hence, we always signal success.
+     * That's why this function is deprecated.
+     *
+     * So despite claiming success, we might still be in the process of registering
+     * or NetworkManager might not be available.
+     *
+     * This is a change in behavior with respect to libnm before 1.24.
+     */
     return TRUE;
 }
 
@@ -1145,14 +1145,14 @@ _register_call_cb(GObject *source, GAsyncResult *result, gpointer user_data)
 
     if (error) {
         /* registration apparently failed. However we still keep priv->registered_against_server TRUE, because
-		 *
-		 * - eventually we want to still make an Unregister() call. Even if it probably has no effect,
-		 *   better be sure.
-		 *
-		 * - we actually accept secret request (from the right name owner). We register so that
-		 *   NetworkManager knows that we are here. We don't require the registration to succeed
-		 *   for our purpose. If NetworkManager makes requests for us, despite the registration
-		 *   failing, that is fine. */
+         *
+         * - eventually we want to still make an Unregister() call. Even if it probably has no effect,
+         *   better be sure.
+         *
+         * - we actually accept secret request (from the right name owner). We register so that
+         *   NetworkManager knows that we are here. We don't require the registration to succeed
+         *   for our purpose. If NetworkManager makes requests for us, despite the registration
+         *   failing, that is fine. */
         _LOGT("register: registration failed with error \"%s\"", error->message);
         goto out;
     }
@@ -1227,9 +1227,9 @@ _get_connection_unix_user_cb(GObject *source, GAsyncResult *result, gpointer use
                   error->message);
 
         /* we actually don't do anything and keep the agent unregistered.
-		 *
-		 * We keep priv->registering_cancellable set to not retry this again, until we loose the
-		 * name owner. But the state of the agent is lingering and won't accept any requests. */
+         *
+         * We keep priv->registering_cancellable set to not retry this again, until we loose the
+         * name owner. But the state of the agent is lingering and won't accept any requests. */
         return;
     }
 
@@ -1322,8 +1322,8 @@ _method_call(GDBusConnection *      connection,
 
     if (!priv->name_owner_curr || !priv->registered_against_server) {
         /* priv->registered_against_server means that we started to register, but not necessarily
-		 * that the registration fully succeeded. However, we already authenticated the request
-		 * and so we accept it, even if the registration is not yet complete. */
+         * that the registration fully succeeded. However, we already authenticated the request
+         * and so we accept it, even if the registration is not yet complete. */
         g_dbus_method_invocation_return_error_literal(context,
                                                       NM_SECRET_AGENT_ERROR,
                                                       NM_SECRET_AGENT_ERROR_PERMISSION_DENIED,
@@ -1354,8 +1354,8 @@ _register_state_complete(NMSecretAgentOld *self)
 
     if (!c_list_is_empty(&priv->pending_tasks_register_lst_head)) {
         /* add a dummy sentinel. We want to complete all the task we started
-		 * so far, but as we invoke user callbacks, the user might register
-		 * new tasks. Those we don't complete in this run. */
+         * so far, but as we invoke user callbacks, the user might register
+         * new tasks. Those we don't complete in this run. */
         g_object_ref(self);
         any_tasks_to_complete = TRUE;
         c_list_link_tail(&priv->pending_tasks_register_lst_head,
@@ -1535,7 +1535,7 @@ _register_state_change(NMSecretAgentOld *self)
 
     if (priv->register_state_change_reenter != 1) {
         /* Recursive calls are prevented. Do nothing for now, but repeat
-		 * the state change afterwards. */
+         * the state change afterwards. */
         priv->register_state_change_reenter = 3;
         return;
     }
@@ -1727,7 +1727,7 @@ init_sync(GInitable *initable, GCancellable *cancellable, GError **error)
     _LOGT("init-sync");
 
     /* See NMClient's sync-init method for explanation about why we create
-	 * an internal GMainContext priv->dbus_context. */
+     * an internal GMainContext priv->dbus_context. */
 
     priv->dbus_context = g_main_context_new();
 
@@ -1889,14 +1889,14 @@ nm_secret_agent_old_class_init(NMSecretAgentOldClass *class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMSecretAgentOld:dbus-connection:
-	 *
-	 * The #GDBusConnection used by the instance. You may either set this
-	 * as construct-only property, or otherwise #NMSecretAgentOld will choose
-	 * a connection via g_bus_get() during initialization.
-	 *
-	 * Since: 1.24
-	 **/
+     * NMSecretAgentOld:dbus-connection:
+     *
+     * The #GDBusConnection used by the instance. You may either set this
+     * as construct-only property, or otherwise #NMSecretAgentOld will choose
+     * a connection via g_bus_get() during initialization.
+     *
+     * Since: 1.24
+     **/
     obj_properties[PROP_DBUS_CONNECTION] =
         g_param_spec_object(NM_SECRET_AGENT_OLD_DBUS_CONNECTION,
                             "",
@@ -1905,16 +1905,16 @@ nm_secret_agent_old_class_init(NMSecretAgentOldClass *class)
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMSecretAgentOld:identifier:
-	 *
-	 * Identifies this agent; only one agent in each user session may use the
-	 * same identifier.  Identifier formatting follows the same rules as
-	 * D-Bus bus names with the exception that the ':' character is not
-	 * allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
-	 * identifier is limited in length to 255 characters with a minimum
-	 * of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
-	 * (without quotes).
-	 **/
+     * NMSecretAgentOld:identifier:
+     *
+     * Identifies this agent; only one agent in each user session may use the
+     * same identifier.  Identifier formatting follows the same rules as
+     * D-Bus bus names with the exception that the ':' character is not
+     * allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+     * identifier is limited in length to 255 characters with a minimum
+     * of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+     * (without quotes).
+     **/
     obj_properties[PROP_IDENTIFIER] =
         g_param_spec_string(NM_SECRET_AGENT_OLD_IDENTIFIER,
                             "",
@@ -1923,26 +1923,26 @@ nm_secret_agent_old_class_init(NMSecretAgentOldClass *class)
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMSecretAgentOld:auto-register:
-	 *
-	 * If %TRUE (the default), the agent will always be registered when
-	 * NetworkManager is running; if NetworkManager exits and restarts, the
-	 * agent will re-register itself automatically.
-	 *
-	 * In particular, if this property is %TRUE at construct time, then the
-	 * agent will register itself with NetworkManager during
-	 * construction/initialization and initialization will only complete
-	 * after registration is completed (either successfully or unsuccessfully).
-	 * Since 1.24, a failure to register will no longer cause initialization
-	 * of #NMSecretAgentOld to fail.
-	 *
-	 * If the property is %FALSE, the agent will not automatically register with
-	 * NetworkManager, and nm_secret_agent_old_enable() or
-	 * nm_secret_agent_old_register_async() must be called to register it.
-	 *
-	 * Calling nm_secret_agent_old_enable() has the same effect as setting this
-	 * property.
-	 **/
+     * NMSecretAgentOld:auto-register:
+     *
+     * If %TRUE (the default), the agent will always be registered when
+     * NetworkManager is running; if NetworkManager exits and restarts, the
+     * agent will re-register itself automatically.
+     *
+     * In particular, if this property is %TRUE at construct time, then the
+     * agent will register itself with NetworkManager during
+     * construction/initialization and initialization will only complete
+     * after registration is completed (either successfully or unsuccessfully).
+     * Since 1.24, a failure to register will no longer cause initialization
+     * of #NMSecretAgentOld to fail.
+     *
+     * If the property is %FALSE, the agent will not automatically register with
+     * NetworkManager, and nm_secret_agent_old_enable() or
+     * nm_secret_agent_old_register_async() must be called to register it.
+     *
+     * Calling nm_secret_agent_old_enable() has the same effect as setting this
+     * property.
+     **/
     obj_properties[PROP_AUTO_REGISTER] =
         g_param_spec_boolean(NM_SECRET_AGENT_OLD_AUTO_REGISTER,
                              "",
@@ -1951,10 +1951,10 @@ nm_secret_agent_old_class_init(NMSecretAgentOldClass *class)
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMSecretAgentOld:registered:
-	 *
-	 * %TRUE if the agent is registered with NetworkManager, %FALSE if not.
-	 **/
+     * NMSecretAgentOld:registered:
+     *
+     * %TRUE if the agent is registered with NetworkManager, %FALSE if not.
+     **/
     obj_properties[PROP_REGISTERED] =
         g_param_spec_boolean(NM_SECRET_AGENT_OLD_REGISTERED,
                              "",
@@ -1963,13 +1963,13 @@ nm_secret_agent_old_class_init(NMSecretAgentOldClass *class)
                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMSecretAgentOld:capabilities:
-	 *
-	 * A bitfield of %NMSecretAgentCapabilities.
-	 *
-	 * Changing this property is possible at any time. In case the secret
-	 * agent is currently registered, this will cause a re-registration.
-	 **/
+     * NMSecretAgentOld:capabilities:
+     *
+     * A bitfield of %NMSecretAgentCapabilities.
+     *
+     * Changing this property is possible at any time. In case the secret
+     * agent is currently registered, this will cause a re-registration.
+     **/
     obj_properties[PROP_CAPABILITIES] =
         g_param_spec_flags(NM_SECRET_AGENT_OLD_CAPABILITIES,
                            "",
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index bd5c21be1c..9fdcce7853 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -129,15 +129,15 @@ typedef struct {
     /* Virtual methods for subclasses */
 
     /* Called when the subclass should retrieve and return secrets.  Subclass
-	 * must copy or reference any arguments it may require after returning from
-	 * this method, as the arguments will freed (except for 'self', 'callback',
-	 * and 'user_data' of course).
-	 *
-	 * Before version 1.24, if the request is canceled, the callback
-	 * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
-	 * error. Since 1.24, invoking the callback has no effect during cancellation
-	 * and may be omitted.
-	 */
+     * must copy or reference any arguments it may require after returning from
+     * this method, as the arguments will freed (except for 'self', 'callback',
+     * and 'user_data' of course).
+     *
+     * Before version 1.24, if the request is canceled, the callback
+     * should still be called, but with the NM_SECRET_AGENT_ERROR_AGENT_CANCELED
+     * 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,
@@ -148,23 +148,23 @@ typedef struct {
                         gpointer                       user_data);
 
     /* Called when the subclass should cancel an outstanding request to
-	 * get secrets for a given connection.
-	 *
-	 * Before version 1.24, canceling the request MUST call the callback that was
-	 * passed along with the initial get_secrets call, sending the NM_SECRET_AGENT_ERROR/
-	 * NM_SECRET_AGENT_ERROR_AGENT_CANCELED error to that callback. Since 1.24,
-	 * the get_secrets callback will be ignored during cancellation and may be omitted.
-	 */
+     * get secrets for a given connection.
+     *
+     * Before version 1.24, canceling the request MUST call the callback that was
+     * passed along with the initial get_secrets call, sending the NM_SECRET_AGENT_ERROR/
+     * NM_SECRET_AGENT_ERROR_AGENT_CANCELED error to that callback. Since 1.24,
+     * 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);
 
     /* Called when the subclass should save the secrets contained in the
-	 * connection to backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'self', 'callback', and 'user_data'
-	 * of course).
-	 */
+     * connection to backing storage.  Subclass must copy or reference any
+     * arguments it may require after returning from this method, as the
+     * arguments will freed (except for 'self', 'callback', and 'user_data'
+     * of course).
+     */
     void (*save_secrets)(NMSecretAgentOld *              self,
                          NMConnection *                  connection,
                          const char *                    connection_path,
@@ -172,11 +172,11 @@ typedef struct {
                          gpointer                        user_data);
 
     /* Called when the subclass should delete the secrets contained in the
-	 * connection from backing storage.  Subclass must copy or reference any
-	 * arguments it may require after returning from this method, as the
-	 * arguments will freed (except for 'self', 'callback', and 'user_data'
-	 * of course).
-	 */
+     * connection from backing storage.  Subclass must copy or reference any
+     * arguments it may require after returning from this method, as the
+     * arguments will freed (except for 'self', 'callback', and 'user_data'
+     * of course).
+     */
     void (*delete_secrets)(NMSecretAgentOld *                self,
                            NMConnection *                    connection,
                            const char *                      connection_path,
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index 290fcb0f88..cfa53a9406 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -92,8 +92,8 @@ _notify_event_state_changed(NMClient *client, NMClientNotifyEventWithPtr *notify
     NMVpnConnectionPrivate *         priv = NM_VPN_CONNECTION_GET_PRIVATE(self);
 
     /* we expose here the value cache in @priv. In practice, this is the same
-	 * value as we received from the signal. In the unexpected case where they
-	 * differ, the cached value of the current instance would still be more correct. */
+     * value as we received from the signal. In the unexpected case where they
+     * differ, the cached value of the current instance would still be more correct. */
     g_signal_emit(self,
                   signals[VPN_STATE_CHANGED],
                   0,
@@ -176,10 +176,10 @@ nm_vpn_connection_class_init(NMVpnConnectionClass *connection_class)
     object_class->finalize     = finalize;
 
     /**
-	 * NMVpnConnection:vpn-state:
-	 *
-	 * The VPN state of the active VPN connection.
-	 **/
+     * NMVpnConnection:vpn-state:
+     *
+     * The VPN state of the active VPN connection.
+     **/
     obj_properties[PROP_VPN_STATE] = g_param_spec_enum(NM_VPN_CONNECTION_VPN_STATE,
                                                        "",
                                                        "",
@@ -188,10 +188,10 @@ nm_vpn_connection_class_init(NMVpnConnectionClass *connection_class)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMVpnConnection:banner:
-	 *
-	 * The VPN login banner of the active VPN connection.
-	 **/
+     * NMVpnConnection:banner:
+     *
+     * The VPN login banner of the active VPN connection.
+     **/
     obj_properties[PROP_BANNER] = g_param_spec_string(NM_VPN_CONNECTION_BANNER,
                                                       "",
                                                       "",
@@ -202,10 +202,10 @@ nm_vpn_connection_class_init(NMVpnConnectionClass *connection_class)
                                               &_nml_dbus_meta_iface_nm_vpn_connection);
 
     /* TODO: the state reason should also be exposed as a property in libnm's NMVpnConnection,
-	 * like done for NMDevice's state reason. */
+     * like done for NMDevice's state reason. */
 
     /* TODO: the D-Bus API should also expose the state-reason as a property instead of
-	 * a "VpnStateChanged" signal. Like done for Device's "StateReason".  */
+     * a "VpnStateChanged" signal. Like done for Device's "StateReason".  */
 
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     signals[VPN_STATE_CHANGED] = g_signal_new("vpn-state-changed",
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index dde5897f04..3b28b0c6af 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -302,8 +302,8 @@ nm_vpn_plugin_old_set_config(NMVpnPluginOld *plugin, GVariant *config)
     g_warn_if_fail(priv->has_ip4 || priv->has_ip6);
 
     /* Record the items that need to also be inserted into the
-	 * ip4config, for compatibility with older daemons.
-	 */
+     * ip4config, for compatibility with older daemons.
+     */
     if (priv->banner)
         g_variant_unref(priv->banner);
     priv->banner = g_variant_lookup_value(config, NM_VPN_PLUGIN_CONFIG_BANNER, G_VARIANT_TYPE("s"));
@@ -342,18 +342,18 @@ nm_vpn_plugin_old_set_ip4_config(NMVpnPluginOld *plugin, GVariant *ip4_config)
     priv->got_ip4 = TRUE;
 
     /* Old plugins won't send the "config" signal and thus can't send
-	 * NM_VPN_PLUGIN_OLD_CONFIG_HAS_IP4 either.  But since they don't support IPv6,
-	 * we can safely assume that, if we don't receive a "config" signal but do
-	 * receive an "ip4-config" signal, the old plugin supports IPv4.
-	 */
+     * NM_VPN_PLUGIN_OLD_CONFIG_HAS_IP4 either.  But since they don't support IPv6,
+     * we can safely assume that, if we don't receive a "config" signal but do
+     * receive an "ip4-config" signal, the old plugin supports IPv4.
+     */
     if (!priv->got_config)
         priv->has_ip4 = TRUE;
 
     /* Older NetworkManager daemons expect all config info to be in
-	 * the ip4 config, so they won't even notice the "config" signal
-	 * being emitted. So just copy all of that data into the ip4
-	 * config too.
-	 */
+     * the ip4 config, so they won't even notice the "config" signal
+     * being emitted. So just copy all of that data into the ip4
+     * config too.
+     */
     g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
     g_variant_iter_init(&iter, ip4_config);
     while (g_variant_iter_next(&iter, "{&sv}", &key, &value)) {
@@ -481,8 +481,8 @@ _connect_generic(NMVpnPluginOld *       plugin,
         g_dbus_method_invocation_take_error(context, error);
 
         /* Stop the plugin from an idle handler so that the Connect
-		 * method return gets sent before the STOP StateChanged signal.
-		 */
+         * method return gets sent before the STOP StateChanged signal.
+         */
         schedule_fail_stop(plugin, fail_stop_timeout);
     }
 
@@ -549,8 +549,8 @@ impl_vpn_plugin_old_need_secrets(NMVpnPluginOld *       plugin,
 
     if (needed) {
         /* Push back the quit timer so the VPN plugin doesn't quit in the
-		 * middle of asking the user for secrets.
-		 */
+         * middle of asking the user for secrets.
+         */
         schedule_quit_timer(plugin);
 
         g_assert(setting_name);
@@ -613,8 +613,8 @@ impl_vpn_plugin_old_new_secrets(NMVpnPluginOld *       plugin,
         g_dbus_method_invocation_take_error(context, error);
 
         /* Stop the plugin from and idle handler so that the NewSecrets
-		 * method return gets sent before the STOP StateChanged signal.
-		 */
+         * method return gets sent before the STOP StateChanged signal.
+         */
         schedule_fail_stop(plugin, 0);
     }
 
@@ -644,13 +644,13 @@ nm_vpn_plugin_old_secrets_required(NMVpnPluginOld *plugin, const char *message,
     g_return_if_fail(NM_VPN_PLUGIN_OLD_GET_CLASS(plugin)->new_secrets);
 
     /* Plugin cannot call this method if NetworkManager didn't originally call
-	 * ConnectInteractive().
-	 */
+     * ConnectInteractive().
+     */
     g_return_if_fail(priv->interactive == TRUE);
 
     /* Cancel the connect timer since secrets might take a while.  It'll
-	 * get restarted when the secrets come back via NewSecrets().
-	 */
+     * get restarted when the secrets come back via NewSecrets().
+     */
     nm_clear_g_source(&priv->connect_timer);
 
     g_signal_emit(plugin, signals[SECRETS_REQUIRED], 0, message, hints);
@@ -1009,12 +1009,12 @@ nm_vpn_plugin_old_class_init(NMVpnPluginOldClass *plugin_class)
     plugin_class->state_changed = state_changed;
 
     /**
-	 * NMVpnPluginOld:service-name:
-	 *
-	 * The D-Bus service name of this plugin.
-	 *
-	 * Deprecated: 1.2: Replaced by NMVpnServicePlugin.
-	 */
+     * NMVpnPluginOld:service-name:
+     *
+     * The D-Bus service name of this plugin.
+     *
+     * Deprecated: 1.2: Replaced by NMVpnServicePlugin.
+     */
     obj_properties[PROP_DBUS_SERVICE_NAME] =
         g_param_spec_string(NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME,
                             "",
@@ -1023,12 +1023,12 @@ nm_vpn_plugin_old_class_init(NMVpnPluginOldClass *plugin_class)
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMVpnPluginOld:state:
-	 *
-	 * The state of the plugin.
-	 *
-	 * Deprecated: 1.2: Replaced by NMVpnServicePlugin.
-	 */
+     * NMVpnPluginOld:state:
+     *
+     * The state of the plugin.
+     *
+     * Deprecated: 1.2: Replaced by NMVpnServicePlugin.
+     */
     obj_properties[PROP_STATE] = g_param_spec_enum(NM_VPN_PLUGIN_OLD_STATE,
                                                    "",
                                                    "",
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 19f6ccc250..f4fbd99b2f 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -339,8 +339,8 @@ nm_vpn_service_plugin_set_config(NMVpnServicePlugin *plugin, GVariant *config)
     (void) g_variant_lookup(config, NM_VPN_PLUGIN_CONFIG_HAS_IP6, "b", &priv->has_ip6);
 
     /* Record the items that need to also be inserted into the
-	 * ip4config, for compatibility with older daemons.
-	 */
+     * ip4config, for compatibility with older daemons.
+     */
     if (priv->banner)
         g_variant_unref(priv->banner);
     priv->banner = g_variant_lookup_value(config, NM_VPN_PLUGIN_CONFIG_BANNER, G_VARIANT_TYPE("s"));
@@ -379,18 +379,18 @@ nm_vpn_service_plugin_set_ip4_config(NMVpnServicePlugin *plugin, GVariant *ip4_c
     priv->got_ip4 = TRUE;
 
     /* Old plugins won't send the "config" signal and thus can't send
-	 * NM_VPN_SERVICE_PLUGIN_CONFIG_HAS_IP4 either.  But since they don't support IPv6,
-	 * we can safely assume that, if we don't receive a "config" signal but do
-	 * receive an "ip4-config" signal, the old plugin supports IPv4.
-	 */
+     * NM_VPN_SERVICE_PLUGIN_CONFIG_HAS_IP4 either.  But since they don't support IPv6,
+     * we can safely assume that, if we don't receive a "config" signal but do
+     * receive an "ip4-config" signal, the old plugin supports IPv4.
+     */
     if (!priv->got_config)
         priv->has_ip4 = TRUE;
 
     /* Older NetworkManager daemons expect all config info to be in
-	 * the ip4 config, so they won't even notice the "config" signal
-	 * being emitted. So just copy all of that data into the ip4
-	 * config too.
-	 */
+     * the ip4 config, so they won't even notice the "config" signal
+     * being emitted. So just copy all of that data into the ip4
+     * config too.
+     */
     g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
     g_variant_iter_init(&iter, ip4_config);
     while (g_variant_iter_next(&iter, "{&sv}", &key, &value)) {
@@ -547,8 +547,8 @@ _connect_generic(NMVpnServicePlugin *   plugin,
         g_dbus_method_invocation_take_error(context, error);
 
         /* Stop the plugin from an idle handler so that the Connect
-		 * method return gets sent before the STOP StateChanged signal.
-		 */
+         * method return gets sent before the STOP StateChanged signal.
+         */
         schedule_fail_stop(plugin, fail_stop_timeout);
     }
 
@@ -615,8 +615,8 @@ impl_vpn_service_plugin_need_secrets(NMVpnServicePlugin *   plugin,
 
     if (needed) {
         /* Push back the quit timer so the VPN plugin doesn't quit in the
-		 * middle of asking the user for secrets.
-		 */
+         * middle of asking the user for secrets.
+         */
         schedule_quit_timer(plugin);
 
         g_assert(setting_name);
@@ -679,8 +679,8 @@ impl_vpn_service_plugin_new_secrets(NMVpnServicePlugin *   plugin,
         g_dbus_method_invocation_take_error(context, error);
 
         /* Stop the plugin from and idle handler so that the NewSecrets
-		 * method return gets sent before the STOP StateChanged signal.
-		 */
+         * method return gets sent before the STOP StateChanged signal.
+         */
         schedule_fail_stop(plugin, 0);
     }
 
@@ -712,13 +712,13 @@ nm_vpn_service_plugin_secrets_required(NMVpnServicePlugin *plugin,
     g_return_if_fail(NM_VPN_SERVICE_PLUGIN_GET_CLASS(plugin)->new_secrets);
 
     /* Plugin cannot call this method if NetworkManager didn't originally call
-	 * ConnectInteractive().
-	 */
+     * ConnectInteractive().
+     */
     g_return_if_fail(priv->interactive == TRUE);
 
     /* Cancel the connect timer since secrets might take a while.  It'll
-	 * get restarted when the secrets come back via NewSecrets().
-	 */
+     * get restarted when the secrets come back via NewSecrets().
+     */
     nm_clear_g_source(&priv->connect_timer);
 
     g_signal_emit(plugin, signals[SECRETS_REQUIRED], 0, message, hints);
@@ -1193,12 +1193,12 @@ nm_vpn_service_plugin_class_init(NMVpnServicePluginClass *plugin_class)
     plugin_class->state_changed = state_changed;
 
     /**
-	 * NMVpnServicePlugin:service-name:
-	 *
-	 * The D-Bus service name of this plugin.
-	 *
-	 * Since: 1.2
-	 */
+     * NMVpnServicePlugin:service-name:
+     *
+     * The D-Bus service name of this plugin.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_DBUS_SERVICE_NAME] =
         g_param_spec_string(NM_VPN_SERVICE_PLUGIN_DBUS_SERVICE_NAME,
                             "",
@@ -1207,12 +1207,12 @@ nm_vpn_service_plugin_class_init(NMVpnServicePluginClass *plugin_class)
                             G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMVpnServicePlugin:watch-peer:
-	 *
-	 * Whether to watch for D-Bus peer's changes.
-	 *
-	 * Since: 1.2
-	 */
+     * NMVpnServicePlugin:watch-peer:
+     *
+     * Whether to watch for D-Bus peer's changes.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_DBUS_WATCH_PEER] =
         g_param_spec_boolean(NM_VPN_SERVICE_PLUGIN_DBUS_WATCH_PEER,
                              "",
@@ -1221,12 +1221,12 @@ nm_vpn_service_plugin_class_init(NMVpnServicePluginClass *plugin_class)
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMVpnServicePlugin:state:
-	 *
-	 * The state of the plugin.
-	 *
-	 * Since: 1.2
-	 */
+     * NMVpnServicePlugin:state:
+     *
+     * The state of the plugin.
+     *
+     * Since: 1.2
+     */
     obj_properties[PROP_STATE] = g_param_spec_enum(NM_VPN_SERVICE_PLUGIN_STATE,
                                                    "",
                                                    "",
diff --git a/libnm/nm-wifi-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index d02aaa0ffc..b136af7c52 100644
--- a/libnm/nm-wifi-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -434,12 +434,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
     object_class->finalize     = finalize;
 
     /**
-	 * NMWifiP2PPeer:flags:
-	 *
-	 * The flags of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:flags:
+     *
+     * The flags of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_FLAGS] = g_param_spec_flags(NM_WIFI_P2P_PEER_FLAGS,
                                                     "",
                                                     "",
@@ -448,12 +448,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:name:
-	 *
-	 * The name of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:name:
+     *
+     * The name of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_NAME] = g_param_spec_string(NM_WIFI_P2P_PEER_NAME,
                                                     "",
                                                     "",
@@ -461,12 +461,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:manufacturer:
-	 *
-	 * The manufacturer of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:manufacturer:
+     *
+     * The manufacturer of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_MANUFACTURER] =
         g_param_spec_string(NM_WIFI_P2P_PEER_MANUFACTURER,
                             "",
@@ -475,12 +475,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:model:
-	 *
-	 * The model of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:model:
+     *
+     * The model of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_MODEL] = g_param_spec_string(NM_WIFI_P2P_PEER_MODEL,
                                                      "",
                                                      "",
@@ -488,12 +488,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:model-number:
-	 *
-	 * The hardware address of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:model-number:
+     *
+     * The hardware address of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_MODEL_NUMBER] =
         g_param_spec_string(NM_WIFI_P2P_PEER_MODEL_NUMBER,
                             "",
@@ -502,12 +502,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:serial:
-	 *
-	 * The serial number of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:serial:
+     *
+     * The serial number of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_SERIAL] = g_param_spec_string(NM_WIFI_P2P_PEER_SERIAL,
                                                       "",
                                                       "",
@@ -515,24 +515,24 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:wfd-ies:
-	 *
-	 * The WFD information elements of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:wfd-ies:
+     *
+     * The WFD information elements of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_WFD_IES] = g_param_spec_boxed(NM_WIFI_P2P_PEER_WFD_IES,
                                                       "",
                                                       "",
                                                       G_TYPE_BYTES,
                                                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
     /**
-	 * NMWifiP2PPeer:hw-address:
-	 *
-	 * The hardware address of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:hw-address:
+     *
+     * The hardware address of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_HW_ADDRESS] =
         g_param_spec_string(NM_WIFI_P2P_PEER_HW_ADDRESS,
                             "",
@@ -541,12 +541,12 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                             G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:strength:
-	 *
-	 * The current signal strength of the P2P peer.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:strength:
+     *
+     * The current signal strength of the P2P peer.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_STRENGTH] = g_param_spec_uchar(NM_WIFI_P2P_PEER_STRENGTH,
                                                        "",
                                                        "",
@@ -556,13 +556,13 @@ nm_wifi_p2p_peer_class_init(NMWifiP2PPeerClass *klass)
                                                        G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWifiP2PPeer:last-seen:
-	 *
-	 * The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
-	 * P2P peer was found.  A value of -1 means the peer has never been seen.
-	 *
-	 * Since: 1.16
-	 **/
+     * NMWifiP2PPeer:last-seen:
+     *
+     * The timestamp (in CLOCK_BOOTTIME seconds) for the last time the
+     * P2P peer was found.  A value of -1 means the peer has never been seen.
+     *
+     * Since: 1.16
+     **/
     obj_properties[PROP_LAST_SEEN] = g_param_spec_int(NM_WIFI_P2P_PEER_LAST_SEEN,
                                                       "",
                                                       "",
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 2c2c00cf98..f1e8d85cba 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -137,12 +137,12 @@ nm_wimax_nsp_class_init(NMWimaxNspClass *nsp_class)
     object_class->get_property = get_property;
 
     /**
-	 * NMWimaxNsp:name:
-	 *
-	 * The name of the WiMAX NSP.
-	 *
-	 * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
-	 **/
+     * NMWimaxNsp:name:
+     *
+     * The name of the WiMAX NSP.
+     *
+     * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
+     **/
     obj_properties[PROP_NAME] = g_param_spec_string(NM_WIMAX_NSP_NAME,
                                                     "",
                                                     "",
@@ -150,12 +150,12 @@ nm_wimax_nsp_class_init(NMWimaxNspClass *nsp_class)
                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWimaxNsp:signal-quality:
-	 *
-	 * The signal quality of the WiMAX NSP.
-	 *
-	 * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
-	 **/
+     * NMWimaxNsp:signal-quality:
+     *
+     * The signal quality of the WiMAX NSP.
+     *
+     * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
+     **/
     obj_properties[PROP_SIGNAL_QUALITY] =
         g_param_spec_uint(NM_WIMAX_NSP_SIGNAL_QUALITY,
                           "",
@@ -166,12 +166,12 @@ nm_wimax_nsp_class_init(NMWimaxNspClass *nsp_class)
                           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
     /**
-	 * NMWimaxNsp:network-type:
-	 *
-	 * The network type of the WiMAX NSP.
-	 *
-	 * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
-	 **/
+     * NMWimaxNsp:network-type:
+     *
+     * The network type of the WiMAX NSP.
+     *
+     * Deprecated: 1.22: WiMAX is no longer supported by NetworkManager since 1.2.0.
+     **/
     obj_properties[PROP_NETWORK_TYPE] =
         g_param_spec_enum(NM_WIMAX_NSP_NETWORK_TYPE,
                           "",
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index fa614e2391..cbbb4a9a8f 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -2743,8 +2743,8 @@ test_types(void)
             continue;
 
         /* We only test parts of the types, and avoid initializing all the types.
-		 * That is so that other unit tests in this process randomly run with either
-		 * the class instance already initialized or not. */
+         * That is so that other unit tests in this process randomly run with either
+         * the class instance already initialized or not. */
         if ((nmtst_get_rand_uint() % 5) == 0) {
             klass = (klass_unref = g_type_class_ref(gtype));
             g_assert(klass);
@@ -2837,8 +2837,8 @@ test_nml_dbus_meta(void)
             g_assert(g_type_is_a(gtype, NM_TYPE_OBJECT));
 
         /* We only test parts of the types, and avoid initializing all the types.
-		 * That is so that other unit tests in this process randomly run with either
-		 * the class instance already initialized or not. */
+         * That is so that other unit tests in this process randomly run with either
+         * the class instance already initialized or not. */
         if ((nmtst_get_rand_uint() % 5) == 0) {
             klass = (klass_unref = g_type_class_ref(gtype));
             g_assert(klass);
@@ -3062,7 +3062,7 @@ check_dbus_properties:
 
                 if (!nm_utils_g_param_spec_is_default(pspec)) {
                     /* We expect our properties to have a default value of zero/NULL.
-					 * Except those whitelisted here: */
+                     * Except those whitelisted here: */
                     if ((mif == &_nml_dbus_meta_iface_nm_accesspoint
                          && nm_streq(pspec->name, NM_ACCESS_POINT_LAST_SEEN))
                         || (mif == &_nml_dbus_meta_iface_nm_device_vxlan
@@ -3319,7 +3319,7 @@ test_dbus_meta_types(void)
     guint i;
 
     /* These iface<->gtype associations are copied from "nm-client.c"'s obj_nm_for_gdbus_object().
-	 * This is redundant to the meta-data, still check that the meta data matches. */
+     * This is redundant to the meta-data, still check that the meta data matches. */
     for (i = 0; i < G_N_ELEMENTS(list); i++) {
         const struct list_data *d = &list[i];
         const NMLDBusMetaIface *meta_iface;
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 4b9919f067..d821978023 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -160,7 +160,7 @@ test_device_added_signal_after_init(void)
     nmtstc_service_add_device(sinfo, client, "AddWiredDevice", "eth0");
 
     /* Ensure the 'device-added' signal doesn't show up before
-	 * the 'Devices' property change notification */
+     * the 'Devices' property change notification */
     /* coverity[loop_condition] */
     while (!(result & SIGNAL_MASK) && !(result & NOTIFY_MASK))
         g_main_context_iteration(NULL, TRUE);
@@ -532,8 +532,8 @@ test_client_nm_running(void)
     client2 = nmtstc_client_new(FALSE);
 
     /* client2 should know that NM is running, but the previously-created
-	 * client1 hasn't gotten the news yet.
-	 */
+     * client1 hasn't gotten the news yet.
+     */
     g_assert(!nm_client_get_nm_running(client1));
     g_assert(nm_client_get_nm_running(client2));
 
@@ -602,7 +602,7 @@ assert_ac_and_device(NMClient *client)
     device_ac = nm_device_get_active_connection(device);
     if (!device_ac) {
         /* the stub NetworkManager service starts activating in an idle handler (delayed). That means, the
-		 * device may not yet refer to the active connection at this point. */
+         * device may not yet refer to the active connection at this point. */
     } else {
         g_assert_cmpstr(nm_object_get_path(NM_OBJECT(ac)),
                         ==,
@@ -705,8 +705,8 @@ test_active_connections(void)
     g_clear_object(&client);
 
     /* Ensure that we can correctly resolve the recursive property link between the
-	 * AC and the Device in a newly-created client.
-	 */
+     * AC and the Device in a newly-created client.
+     */
     client = nmtstc_client_new(TRUE);
     assert_ac_and_device(client);
     g_clear_object(&client);
@@ -830,10 +830,10 @@ test_activate_virtual(void)
                      &info);
 
     /* We're expecting a client::devices change, client::activate callback,
-	 * and a device::active-connection change.
-	 * The client::devices callback can hook a client::active-connections
-	 * change and bump this if the property is not yet loaded.
-	 */
+     * and a device::active-connection change.
+     * The client::devices callback can hook a client::active-connections
+     * change and bump this if the property is not yet loaded.
+     */
     info.remaining = 3;
 
     g_main_loop_run(gl.loop);
@@ -966,8 +966,8 @@ test_connection_invalid(void)
              == (g_main_context_get_thread_default() ?: g_main_context_default()));
 
     /**************************************************************************
-	 * Add three connections before starting libnm. One valid, two invalid.
-	 *************************************************************************/
+     * Add three connections before starting libnm. One valid, two invalid.
+     *************************************************************************/
 
     connection = nmtst_create_minimal_connection("test-connection-invalid-0",
                                                  NULL,
@@ -1029,8 +1029,8 @@ test_connection_invalid(void)
     nmtst_assert_connection_unnormalizable(connections->pdata[idx[2]], 0, 0);
 
     /**************************************************************************
-	 * After having the client up and running, add another invalid connection
-	 *************************************************************************/
+     * After having the client up and running, add another invalid connection
+     *************************************************************************/
 
     g_object_set(s_con,
                  NM_SETTING_CONNECTION_ID,
@@ -1066,8 +1066,8 @@ test_connection_invalid(void)
     nmtst_assert_connection_unnormalizable(connections->pdata[idx[3]], 0, 0);
 
     /**************************************************************************
-	 * Modify the invalid connection (still invalid)
-	 *************************************************************************/
+     * Modify the invalid connection (still invalid)
+     *************************************************************************/
 
     NMTST_VARIANT_EDITOR(variant,
                          NMTST_VARIANT_CHANGE_PROPERTY("invalid-type-2", "some-key2", "u", 4721));
@@ -1098,8 +1098,8 @@ test_connection_invalid(void)
     nmtst_assert_connection_unnormalizable(connections->pdata[idx[3]], 0, 0);
 
     /**************************************************************************
-	 * Modify the invalid connection (becomes valid)
-	 *************************************************************************/
+     * Modify the invalid connection (becomes valid)
+     *************************************************************************/
 
     NMTST_VARIANT_EDITOR(variant, NMTST_VARIANT_DROP_SETTING("invalid-type-2"));
     NMTST_VARIANT_EDITOR(variant,
@@ -1134,8 +1134,8 @@ test_connection_invalid(void)
     nmtst_assert_connection_unnormalizable(connections->pdata[idx[3]], 0, 0);
 
     /**************************************************************************
-	 * Modify the invalid connection (still invalid)
-	 *************************************************************************/
+     * Modify the invalid connection (still invalid)
+     *************************************************************************/
 
     g_object_set(s_con, NM_SETTING_CONNECTION_ID, "test-connection-invalid-2x", NULL);
     nmtstc_service_update_connection(my_sinfo, path3, connection, FALSE);
@@ -1167,8 +1167,8 @@ test_connection_invalid(void)
                     nm_connection_get_id(connections->pdata[idx[3]]));
 
     /**************************************************************************
-	 * Modify the invalid connection (now becomes valid)
-	 *************************************************************************/
+     * Modify the invalid connection (now becomes valid)
+     *************************************************************************/
 
     g_clear_object(&connection);
     connection = nmtst_create_minimal_connection("test-connection-invalid-2",
@@ -1214,8 +1214,8 @@ test_connection_invalid(void)
                     nm_connection_get_id(connections->pdata[idx[3]]));
 
     /**************************************************************************
-	 * Modify the invalid connection and make it valid
-	 *************************************************************************/
+     * Modify the invalid connection and make it valid
+     *************************************************************************/
 
     g_clear_object(&connection);
     connection = nmtst_create_minimal_connection("test-connection-invalid-1",
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 81c37cdc12..35ef80aa83 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -34,9 +34,9 @@ add_cb(GObject *s, GAsyncResult *result, gpointer user_data)
     g_object_add_weak_pointer(G_OBJECT(gl.remote), (void **) &gl.remote);
 
     /* nm_client_add_connection_finish() adds a ref to @remote, but we
-	 * want the weak pointer to be cleared as soon as @client drops its own ref.
-	 * So drop ours.
-	 */
+     * want the weak pointer to be cleared as soon as @client drops its own ref.
+     * So drop ours.
+     */
     g_object_unref(gl.remote);
 }
 
@@ -357,8 +357,8 @@ test_add_remove_connection(void)
         return;
 
     /* This will cause the test server to immediately delete the connection
-	 * after creating it.
-	 */
+     * after creating it.
+     */
     ret = g_dbus_proxy_call_sync(gl.sinfo->proxy,
                                  "AutoRemoveNextConnection",
                                  NULL,
@@ -478,8 +478,8 @@ main(int argc, char **argv)
     gl.client = nmtstc_client_new(TRUE);
 
     /* FIXME: these tests assume that they get run in order, but g_test_run()
-	 * does not actually guarantee that!
-	 */
+     * does not actually guarantee that!
+     */
     g_test_add_func("/client/add_connection", test_add_connection);
     g_test_add_func("/client/make_invisible", test_make_invisible);
     g_test_add_func("/client/make_visible", test_make_visible);