[NetworkManager-vpnc/lr/gtk-4.0: 8/14] properties: move size group setup to GtkBuilder file

[Lubomir Rintel <lkundrak src gnome org>]

commit 70f1d6e0694e0230d0a4b9803230e1d4c9b107d0
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Wed Nov 3 15:23:20 2021 +0100

    properties: move size group setup to GtkBuilder file

 properties/nm-vpnc-dialog.ui | 24 ++++++++++++++++++++++++
 properties/nm-vpnc-editor.c  | 19 -------------------
 2 files changed, 24 insertions(+), 19 deletions(-)
---
diff --git a/properties/nm-vpnc-dialog.ui b/properties/nm-vpnc-dialog.ui
index deb4849..65205c9 100644
--- a/properties/nm-vpnc-dialog.ui
+++ b/properties/nm-vpnc-dialog.ui
@@ -296,6 +296,30 @@ config: CA-File</property>
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="labels">
+    <widgets>
+      <widget name="label23"/>
+      <widget name="label26"/>
+      <widget name="label3"/>
+      <widget name="label24"/>
+      <widget name="label4"/>
+      <widget name="cafile_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="advanced_labels">
+    <widgets>
+      <widget name="label27"/>
+      <widget name="label28"/>
+      <widget name="label29"/>
+      <widget name="label2"/>
+      <widget name="label7"/>
+      <widget name="label31"/>
+      <widget name="label41"/>
+      <widget name="label5"/>
+      <widget name="label6"/>
+      <widget name="local_port_label"/>
+    </widgets>
+  </object>
   <object class="GtkListStore" id="model1">
     <columns>
       <!-- column-name gchararray -->
diff --git a/properties/nm-vpnc-editor.c b/properties/nm-vpnc-editor.c
index 2c0db1e..b54784a 100644
--- a/properties/nm-vpnc-editor.c
+++ b/properties/nm-vpnc-editor.c
@@ -54,7 +54,6 @@ G_DEFINE_TYPE_EXTENDED (VpncEditor, vpnc_editor, G_TYPE_OBJECT, 0,
 typedef struct {
        GtkBuilder *builder;
        GtkWidget *widget;
-       GtkSizeGroup *group;
        gint orig_dpd_timeout;
        GtkWidget *advanced_dialog;
 } VpncEditorPrivate;
@@ -137,7 +136,6 @@ setup_password_widget (VpncEditor *self,
 
        widget = (GtkWidget *) gtk_builder_get_object (priv->builder, entry_name);
        g_assert (widget);
-       gtk_size_group_add_widget (priv->group, widget);
 
        if (s_vpn) {
                value = nm_setting_vpn_get_secret (s_vpn, secret_name);
@@ -342,11 +340,8 @@ init_plugin_ui (VpncEditor *self,
                s_vpn = nm_connection_get_setting_vpn (connection);
        }
 
-       priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "gateway_entry"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_GATEWAY);
                if (value && strlen (value))
@@ -356,7 +351,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "group_entry"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_ID);
                if (value && strlen (value))
@@ -366,7 +360,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "encryption_combo"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
 
        store = gtk_list_store_new (1, G_TYPE_STRING);
 
@@ -421,7 +414,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user_entry"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_XAUTH_USER);
                if (value && strlen (value))
@@ -431,7 +423,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "domain_entry"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_DOMAIN);
                if (value && strlen (value))
@@ -461,7 +452,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "vendor_combo"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
        g_object_unref (store);
        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active);
@@ -470,7 +460,6 @@ init_plugin_ui (VpncEditor *self,
        /* Application version */
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "application_version_entry"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_APP_VERSION);
                if (value && strlen (value))
@@ -523,7 +512,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "natt_combo"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
        g_object_unref (store);
        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active);
@@ -557,7 +545,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dhgroup_combo"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
        g_object_unref (store);
        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 1 : active);
@@ -566,7 +553,6 @@ init_plugin_ui (VpncEditor *self,
        /* Local Port */
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "local_port_spinbutton"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        if (s_vpn) {
                value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_LOCAL_PORT);
                if (value) {
@@ -643,7 +629,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "pfsecrecy_combo"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget));
        gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
        g_object_unref (store);
        gtk_combo_box_set_active (GTK_COMBO_BOX (widget), active < 0 ? 0 : active);
@@ -671,7 +656,6 @@ init_plugin_ui (VpncEditor *self,
 
        widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "ca_file_chooser"));
        g_return_val_if_fail (widget != NULL, FALSE);
-       gtk_size_group_add_widget (priv->group, widget);
        gtk_widget_set_sensitive (widget, enabled);
        gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
        gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
@@ -993,9 +977,6 @@ dispose (GObject *object)
        VpncEditor *plugin = VPNC_EDITOR (object);
        VpncEditorPrivate *priv = VPNC_EDITOR_GET_PRIVATE (plugin);
 
-       if (priv->group)
-               g_object_unref (priv->group);
-
        if (priv->widget)
                g_object_unref (priv->widget);