Merge branch 'debian/master' into ubuntu/master

1 files changed, 24 insertions, 24 deletions

diff --git a/libnm/nm-vpn-editor.c b/libnm/nm-vpn-editor.c
index 1e86279b..5538454b 100644
--- a/libnm/nm-vpn-editor.c
+++ b/libnm/nm-vpn-editor.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2008 - 2010 Red Hat, Inc.
  * Copyright (C) 2008 Novell, Inc.
@@ -8,23 +8,25 @@
 
 #include "nm-vpn-editor.h"
 
-static void nm_vpn_editor_default_init (NMVpnEditorInterface *iface);
+static void nm_vpn_editor_default_init(NMVpnEditorInterface *iface);
 
-G_DEFINE_INTERFACE (NMVpnEditor, nm_vpn_editor, G_TYPE_OBJECT)
+G_DEFINE_INTERFACE(NMVpnEditor, nm_vpn_editor, G_TYPE_OBJECT)
 
 static void
-nm_vpn_editor_default_init (NMVpnEditorInterface *iface)
+nm_vpn_editor_default_init(NMVpnEditorInterface *iface)
 {
-	GType iface_type = G_TYPE_FROM_INTERFACE (iface);
-
-	/* Signals */
-	g_signal_new ("changed",
-	              iface_type,
-	              G_SIGNAL_RUN_FIRST,
-	              G_STRUCT_OFFSET (NMVpnEditorInterface, changed),
-	              NULL, NULL,
-	              g_cclosure_marshal_VOID__VOID,
-	              G_TYPE_NONE, 0);
+    GType iface_type = G_TYPE_FROM_INTERFACE(iface);
+
+    /* Signals */
+    g_signal_new("changed",
+                 iface_type,
+                 G_SIGNAL_RUN_FIRST,
+                 G_STRUCT_OFFSET(NMVpnEditorInterface, changed),
+                 NULL,
+                 NULL,
+                 g_cclosure_marshal_VOID__VOID,
+                 G_TYPE_NONE,
+                 0);
 }
 
 /**
@@ -34,22 +36,20 @@ nm_vpn_editor_default_init (NMVpnEditorInterface *iface)
  * Returns: (transfer none):
  */
 GObject *
-nm_vpn_editor_get_widget (NMVpnEditor *editor)
+nm_vpn_editor_get_widget(NMVpnEditor *editor)
 {
-	g_return_val_if_fail (NM_IS_VPN_EDITOR (editor), NULL);
+    g_return_val_if_fail(NM_IS_VPN_EDITOR(editor), NULL);
 
-	return NM_VPN_EDITOR_GET_INTERFACE (editor)->get_widget (editor);
+    return NM_VPN_EDITOR_GET_INTERFACE(editor)->get_widget(editor);
 }
 
 gboolean
-nm_vpn_editor_update_connection (NMVpnEditor *editor,
-                                 NMConnection *connection,
-                                 GError **error)
+nm_vpn_editor_update_connection(NMVpnEditor *editor, NMConnection *connection, GError **error)
 {
-	g_return_val_if_fail (NM_IS_VPN_EDITOR (editor), FALSE);
+    g_return_val_if_fail(NM_IS_VPN_EDITOR(editor), FALSE);
 
-	if (error)
-		g_return_val_if_fail (*error == NULL, FALSE);
+    if (error)
+        g_return_val_if_fail(*error == NULL, FALSE);
 
-	return NM_VPN_EDITOR_GET_INTERFACE (editor)->update_connection (editor, connection, error);
+    return NM_VPN_EDITOR_GET_INTERFACE(editor)->update_connection(editor, connection, error);
 }