New upstream version 1.27.90 upstream/1.27.90

1 files changed, 82 insertions, 80 deletions

diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index f82dfcb9..675bcaac 100644
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2013 Red Hat, Inc.
  */
@@ -17,101 +17,103 @@
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"
 
-G_DEFINE_TYPE (NmtPageVlan, nmt_page_vlan, NMT_TYPE_EDITOR_PAGE_DEVICE)
+G_DEFINE_TYPE(NmtPageVlan, nmt_page_vlan, NMT_TYPE_EDITOR_PAGE_DEVICE)
 
 NmtEditorPage *
-nmt_page_vlan_new (NMConnection   *conn,
-                   NmtDeviceEntry *deventry)
+nmt_page_vlan_new(NMConnection *conn, NmtDeviceEntry *deventry)
 {
-	return g_object_new (NMT_TYPE_PAGE_VLAN,
-	                     "connection", conn,
-	                     "device-entry", deventry,
-	                     NULL);
+    return g_object_new(NMT_TYPE_PAGE_VLAN, "connection", conn, "device-entry", deventry, NULL);
 }
 
 static void
-nmt_page_vlan_init (NmtPageVlan *vlan)
-{
-}
+nmt_page_vlan_init(NmtPageVlan *vlan)
+{}
 
 static gboolean
-vlan_device_filter (NmtDeviceEntry *deventry,
-                    NMDevice       *device,
-                    gpointer        user_data)
+vlan_device_filter(NmtDeviceEntry *deventry, NMDevice *device, gpointer user_data)
 {
-	// FIXME
-	return NM_IS_DEVICE_ETHERNET (device);
+    // FIXME
+    return NM_IS_DEVICE_ETHERNET(device);
 }
 
 static void
-nmt_page_vlan_constructed (GObject *object)
+nmt_page_vlan_constructed(GObject *object)
 {
-	NmtPageVlan *vlan = NMT_PAGE_VLAN (object);
-	NmtEditorSection *section;
-	NmtEditorGrid *grid;
-	NMSettingWired *s_wired;
-	NMSettingVlan *s_vlan;
-	NmtNewtWidget *widget, *parent, *id_entry;
-	NMConnection *conn;
-
-	conn = nmt_editor_page_get_connection (NMT_EDITOR_PAGE (vlan));
-	s_vlan = nm_connection_get_setting_vlan (conn);
-	if (!s_vlan) {
-		nm_connection_add_setting (conn, nm_setting_vlan_new ());
-		s_vlan = nm_connection_get_setting_vlan (conn);
-	}
-	s_wired = nm_connection_get_setting_wired (conn);
-	if (!s_wired) {
-		nm_connection_add_setting (conn, nm_setting_wired_new ());
-		s_wired = nm_connection_get_setting_wired (conn);
-	}
-
-	section = nmt_editor_section_new (_("VLAN"), NULL, TRUE);
-	grid = nmt_editor_section_get_body (section);
-
-	nm_editor_bind_vlan_name (s_vlan, nm_connection_get_setting_connection (conn));
-
-	widget = parent = nmt_device_entry_new (_("Parent"), 40, G_TYPE_NONE);
-	nmt_device_entry_set_device_filter (NMT_DEVICE_ENTRY (widget),
-	                                    vlan_device_filter, vlan);
-	g_object_bind_property (s_vlan, NM_SETTING_VLAN_PARENT,
-	                        widget, "interface-name",
-	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-	g_object_bind_property (s_wired, NM_SETTING_WIRED_MAC_ADDRESS,
-	                        widget, "mac-address",
-	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-	nmt_editor_grid_append (grid, NULL, widget, NULL);
-
-	widget = id_entry = nmt_newt_entry_numeric_new (8, 0, 4094);
-	g_object_bind_property (s_vlan, NM_SETTING_VLAN_ID,
-	                        widget, "text",
-	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-	nmt_editor_grid_append (grid, _("VLAN id"), widget, NULL);
-
-	nmt_editor_grid_append (grid, NULL, nmt_newt_separator_new (), NULL);
-
-	widget = nmt_mac_entry_new (40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED);
-	g_object_bind_property (s_wired, NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
-	                        widget, "mac-address",
-	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-	nmt_editor_grid_append (grid, _("Cloned MAC address"), widget, NULL);
-
-	widget = nmt_mtu_entry_new ();
-	g_object_bind_property (s_wired, NM_SETTING_WIRED_MTU,
-	                        widget, "mtu",
-	                        G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-	nmt_editor_grid_append (grid, _("MTU"), widget, NULL);
-
-	nmt_editor_page_add_section (NMT_EDITOR_PAGE (vlan), section);
-
-	G_OBJECT_CLASS (nmt_page_vlan_parent_class)->constructed (object);
+    NmtPageVlan *     vlan = NMT_PAGE_VLAN(object);
+    NmtEditorSection *section;
+    NmtEditorGrid *   grid;
+    NMSettingWired *  s_wired;
+    NMSettingVlan *   s_vlan;
+    NmtNewtWidget *   widget, *parent, *id_entry;
+    NMConnection *    conn;
+
+    conn   = nmt_editor_page_get_connection(NMT_EDITOR_PAGE(vlan));
+    s_vlan = nm_connection_get_setting_vlan(conn);
+    if (!s_vlan) {
+        nm_connection_add_setting(conn, nm_setting_vlan_new());
+        s_vlan = nm_connection_get_setting_vlan(conn);
+    }
+    s_wired = nm_connection_get_setting_wired(conn);
+    if (!s_wired) {
+        nm_connection_add_setting(conn, nm_setting_wired_new());
+        s_wired = nm_connection_get_setting_wired(conn);
+    }
+
+    section = nmt_editor_section_new(_("VLAN"), NULL, TRUE);
+    grid    = nmt_editor_section_get_body(section);
+
+    nm_editor_bind_vlan_name(s_vlan, nm_connection_get_setting_connection(conn));
+
+    widget = parent = nmt_device_entry_new(_("Parent"), 40, G_TYPE_NONE);
+    nmt_device_entry_set_device_filter(NMT_DEVICE_ENTRY(widget), vlan_device_filter, vlan);
+    g_object_bind_property(s_vlan,
+                           NM_SETTING_VLAN_PARENT,
+                           widget,
+                           "interface-name",
+                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+    g_object_bind_property(s_wired,
+                           NM_SETTING_WIRED_MAC_ADDRESS,
+                           widget,
+                           "mac-address",
+                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+    nmt_editor_grid_append(grid, NULL, widget, NULL);
+
+    widget = id_entry = nmt_newt_entry_numeric_new(8, 0, 4094);
+    g_object_bind_property(s_vlan,
+                           NM_SETTING_VLAN_ID,
+                           widget,
+                           "text",
+                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+    nmt_editor_grid_append(grid, _("VLAN id"), widget, NULL);
+
+    nmt_editor_grid_append(grid, NULL, nmt_newt_separator_new(), NULL);
+
+    widget = nmt_mac_entry_new(40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED);
+    g_object_bind_property(s_wired,
+                           NM_SETTING_WIRED_CLONED_MAC_ADDRESS,
+                           widget,
+                           "mac-address",
+                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+    nmt_editor_grid_append(grid, _("Cloned MAC address"), widget, NULL);
+
+    widget = nmt_mtu_entry_new();
+    g_object_bind_property(s_wired,
+                           NM_SETTING_WIRED_MTU,
+                           widget,
+                           "mtu",
+                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+    nmt_editor_grid_append(grid, _("MTU"), widget, NULL);
+
+    nmt_editor_page_add_section(NMT_EDITOR_PAGE(vlan), section);
+
+    G_OBJECT_CLASS(nmt_page_vlan_parent_class)->constructed(object);
 }
 
 static void
-nmt_page_vlan_class_init (NmtPageVlanClass *vlan_class)
+nmt_page_vlan_class_init(NmtPageVlanClass *vlan_class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (vlan_class);
+    GObjectClass *object_class = G_OBJECT_CLASS(vlan_class);
 
-	/* virtual methods */
-	object_class->constructed = nmt_page_vlan_constructed;
+    /* virtual methods */
+    object_class->constructed = nmt_page_vlan_constructed;
 }