[gnome-control-center] network: Simplify helper function



commit 69a5b8750bc1823a1ee9a055aa0029c388874d91
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Nov 8 15:34:51 2019 +1300

    network: Simplify helper function

 panels/network/wireless-security/wireless-security.c | 3 ---
 panels/network/wireless-security/wireless-security.h | 1 -
 panels/network/wireless-security/ws-dynamic-wep.c    | 3 ++-
 panels/network/wireless-security/ws-wpa-eap.c        | 3 ++-
 4 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/panels/network/wireless-security/wireless-security.c 
b/panels/network/wireless-security/wireless-security.c
index 199cd1f77..1c7106b95 100644
--- a/panels/network/wireless-security/wireless-security.c
+++ b/panels/network/wireless-security/wireless-security.c
@@ -377,13 +377,10 @@ get_active_method (GtkComboBox *combo)
 
 void
 ws_802_1x_add_to_size_group (GtkSizeGroup *size_group,
-                             GtkLabel *label,
                              GtkComboBox *combo)
 {
        g_autoptr(EAPMethod) eap = NULL;
 
-       gtk_size_group_add_widget (size_group, GTK_WIDGET (label));
-
        eap = get_active_method (combo);
        g_assert (eap);
        eap_method_add_to_size_group (eap, size_group);
diff --git a/panels/network/wireless-security/wireless-security.h 
b/panels/network/wireless-security/wireless-security.h
index 6db979a1d..97570906d 100644
--- a/panels/network/wireless-security/wireless-security.h
+++ b/panels/network/wireless-security/wireless-security.h
@@ -123,7 +123,6 @@ void ws_802_1x_auth_combo_changed (GtkComboBox *combo,
 gboolean ws_802_1x_validate (GtkComboBox *combo, GError **error);
 
 void ws_802_1x_add_to_size_group (GtkSizeGroup *size_group,
-                                  GtkLabel *label,
                                   GtkComboBox *combo);
 
 void ws_802_1x_fill_connection (GtkComboBox *combo,
diff --git a/panels/network/wireless-security/ws-dynamic-wep.c 
b/panels/network/wireless-security/ws-dynamic-wep.c
index 85ff5502e..c04ff5e01 100644
--- a/panels/network/wireless-security/ws-dynamic-wep.c
+++ b/panels/network/wireless-security/ws-dynamic-wep.c
@@ -70,7 +70,8 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
        g_clear_object (&self->size_group);
        self->size_group = g_object_ref (group);
 
-       ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);
+       gtk_size_group_add_widget (self->size_group, GTK_WIDGET (self->auth_label));
+       ws_802_1x_add_to_size_group (self->size_group, self->auth_combo);
 }
 
 static void
diff --git a/panels/network/wireless-security/ws-wpa-eap.c b/panels/network/wireless-security/ws-wpa-eap.c
index f090c7a13..86b566582 100644
--- a/panels/network/wireless-security/ws-wpa-eap.c
+++ b/panels/network/wireless-security/ws-wpa-eap.c
@@ -71,7 +71,8 @@ add_to_size_group (WirelessSecurity *parent, GtkSizeGroup *group)
        g_clear_object (&self->size_group);
        self->size_group = g_object_ref (group);
 
-       ws_802_1x_add_to_size_group (self->size_group, self->auth_label, self->auth_combo);
+       gtk_size_group_add_widget (self->size_group, GTK_WIDGET (self->auth_label));
+       ws_802_1x_add_to_size_group (self->size_group, self->auth_combo);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]