From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 21 Jun 2023 20:05:29 +0000 (-0400)
Subject: widget: Don't let abstract role slip through
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~110^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2983c0be7047e878b9bb585f8f50b4977afc4741;p=gtk4.git

widget: Don't let abstract role slip through

When there isn't an accessible role set on the
instance or in class_init, we want to default
to 'generic'. There was one place where we
failed to do so.
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8576010eb3..dd2920e597 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2401,6 +2401,8 @@ gtk_widget_root_at_context (GtkWidget *self)
   /* Reset the accessible role to its current value */
   if (role == GTK_ACCESSIBLE_ROLE_WIDGET)
     role = GTK_WIDGET_GET_CLASS (self)->priv->accessible_role;
+  if (role == GTK_ACCESSIBLE_ROLE_WIDGET)
+    role = GTK_ACCESSIBLE_ROLE_GENERIC;
 
   gtk_at_context_set_accessible_role (priv->at_context, role);
   if (priv->root)