From e248c6812e8e33150d61074471ef0330668aed45 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 3 Oct 2011 17:05:40 +0200 Subject: [PATCH] a11y: Hack around infinite loops in parent setting This is kind of a hack to get rid of infinite loops that occur when child accessibles try to set their parent upon creation but the parent accessible creates its children in the initialize vfunc. Because in that case, the parent will not have an accessible set when the child tries to access it, because it is still initializing itself. Which will cause a new accessible to be created. https://bugzilla.gnome.org/show_bug.cgi?id=660687 --- gtk/gtkwidget.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f90e3b3099..63822058ab 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -12089,19 +12089,27 @@ gtk_widget_real_get_accessible (GtkWidget *widget) accessible = atk_object_factory_create_accessible (factory, G_OBJECT (widget)); + + if (priv->accessible_role != ATK_ROLE_INVALID) + atk_object_set_role (accessible, priv->accessible_role); + + g_object_set_qdata (G_OBJECT (widget), + quark_accessible_object, + accessible); } else { accessible = g_object_new (priv->accessible_type, NULL); + + if (priv->accessible_role != ATK_ROLE_INVALID) + atk_object_set_role (accessible, priv->accessible_role); + + g_object_set_qdata (G_OBJECT (widget), + quark_accessible_object, + accessible); + atk_object_initialize (accessible, widget); } - - if (priv->accessible_role != ATK_ROLE_INVALID) - atk_object_set_role (accessible, priv->accessible_role); - - g_object_set_qdata (G_OBJECT (widget), - quark_accessible_object, - accessible); } return accessible; }