applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

network: Remove duplicate list

Browse source 
We can just iterate over the GtkNotebook - no need to mantain a list of pages.
This commit is contained in:
Robert Ancell 2020-11-19 11:50:48 +13:00 • committed by Georges Basile Stavracas Neto
parent 362548fbd1
commit aef13948eb
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
panels/network/connection-editor/net-connection-editor.c
View file

@ -69,7 +69,6 @@ struct _NetConnectionEditor
NMAccessPoint *ap; NMAccessPoint *ap;
GSList *initializing_pages; GSList *initializing_pages;
GSList *pages;
NMClientPermissionResult can_modify; NMClientPermissionResult can_modify;
@ -324,7 +323,7 @@ update_sensitivity (NetConnectionEditor *self)
{ {
NMSettingConnection *sc; NMSettingConnection *sc;
gboolean sensitive; gboolean sensitive;
GSList *l; GList *pages;
if (!editor_is_initialized (self)) if (!editor_is_initialized (self))
return; return;
@ -337,29 +336,34 @@ update_sensitivity (NetConnectionEditor *self)
sensitive = self->can_modify; sensitive = self->can_modify;
} }
for (l = self->pages; l; l = l->next) pages = gtk_container_get_children (GTK_CONTAINER (self->notebook));
gtk_widget_set_sensitive (GTK_WIDGET (l->data), sensitive); for (GList *l = pages; l; l = l->next) {
CEPage *page = l->data;
gtk_widget_set_sensitive (GTK_WIDGET (page), sensitive);
}
} }
static void static void
validate (NetConnectionEditor *self) validate (NetConnectionEditor *self)
{ {
gboolean valid = FALSE; gboolean valid = FALSE;
GSList *l; GList *pages;
if (!editor_is_initialized (self)) if (!editor_is_initialized (self))
goto done; goto done;
valid = TRUE; valid = TRUE;
for (l = self->pages; l; l = l->next) { pages = gtk_container_get_children (GTK_CONTAINER (self->notebook));
for (GList *l = pages; l; l = l->next) {
CEPage *page = l->data;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
if (!ce_page_validate (CE_PAGE (l->data), self->connection, &error)) { if (!ce_page_validate (page, self->connection, &error)) {
valid = FALSE; valid = FALSE;
if (error) { if (error) {
g_debug ("Invalid setting %s: %s", ce_page_get_title (CE_PAGE (l->data)), error->message); g_debug ("Invalid setting %s: %s", ce_page_get_title (page), error->message);
} else { } else {
g_debug ("Invalid setting %s", ce_page_get_title (CE_PAGE (l->data))); g_debug ("Invalid setting %s", ce_page_get_title (page));
} }
} }
} }
@ -420,7 +424,6 @@ page_initialized (NetConnectionEditor *self, GError *error, CEPage *page)
gtk_notebook_insert_page (self->notebook, GTK_WIDGET (page), label, i); gtk_notebook_insert_page (self->notebook, GTK_WIDGET (page), label, i);
self->initializing_pages = g_slist_remove (self->initializing_pages, page); self->initializing_pages = g_slist_remove (self->initializing_pages, page);
self->pages = g_slist_append (self->pages, page);
recheck_initialization (self); recheck_initialization (self);
} }