AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-16 21:50:34 +00:00
Code Issues Projects Releases Wiki Activity

shortcuts: Don't forall() widgets that aren't children

Browse Source
This commit is contained in:
Benjamin Otte 2016-01-22 20:39:14 +01:00
parent efc899bd2b
commit 0a9e9db9f4
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkshortcutssection.c
View File

@ -163,14 +163,15 @@ gtk_shortcuts_section_forall (GtkContainer *container,
if (include_internal)
{
callback (GTK_WIDGET (self->stack), callback_data);
callback (GTK_WIDGET (self->footer), callback_data);
GTK_CONTAINER_CLASS (gtk_shortcuts_section_parent_class)->forall (container, include_internal, callback, callback_data);
}
for (l = self->groups; l; l = l->next)
else
{
GtkWidget *group = l->data;
callback (group, callback_data);
for (l = self->groups; l; l = l->next)
{
GtkWidget *group = l->data;
callback (group, callback_data);
}
}
}

39
gtk/gtkshortcutswindow.c
View File

@ -371,32 +371,29 @@ gtk_shortcuts_window_forall (GtkContainer *container,
if (include_internal)
{
if (priv->header_bar)
callback (GTK_WIDGET (priv->header_bar), callback_data);
if (priv->main_box)
callback (GTK_WIDGET (priv->main_box), callback_data);
if (priv->popover)
callback (GTK_WIDGET (priv->popover), callback_data);
GTK_CONTAINER_CLASS (gtk_shortcuts_window_parent_class)->forall (container, include_internal, callback, callback_data);
}
if (priv->stack)
else
{
GList *children, *l;
GtkWidget *search;
GtkWidget *empty;
search = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "internal-search");
empty = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "no-search-results");
children = gtk_container_get_children (GTK_CONTAINER (priv->stack));
for (l = children; l; l = l->next)
if (priv->stack)
{
GtkWidget *child = l->data;
GList *children, *l;
GtkWidget *search;
GtkWidget *empty;
if (include_internal ||
(child != search && child != empty))
callback (child, callback_data);
search = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "internal-search");
empty = gtk_stack_get_child_by_name (GTK_STACK (priv->stack), "no-search-results");
children = gtk_container_get_children (GTK_CONTAINER (priv->stack));
for (l = children; l; l = l->next)
{
GtkWidget *child = l->data;
if (include_internal ||
(child != search && child != empty))
callback (child, callback_data);
}
g_list_free (children);
}
g_list_free (children);
}
}