From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 21 Jun 2023 02:02:37 +0000 (-0400)
Subject: Make generic really the default role
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~115^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9f870fee69f26c4d88d756ce934ae5bab016613;p=gtk4.git

Make generic really the default role

If nothing else has been set for the instance
or the class, return GTK_ACCESSIBLE_ROLE_GENERIC.
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index e8225cdbbf..8576010eb3 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -921,7 +921,10 @@ gtk_widget_get_accessible_role (GtkWidget *self)
   if (priv->accessible_role != GTK_ACCESSIBLE_ROLE_WIDGET)
     return priv->accessible_role;
 
-  return GTK_WIDGET_GET_CLASS (self)->priv->accessible_role;
+  if (GTK_WIDGET_GET_CLASS (self)->priv->accessible_role != GTK_ACCESSIBLE_ROLE_WIDGET)
+    return GTK_WIDGET_GET_CLASS (self)->priv->accessible_role;
+
+  return GTK_ACCESSIBLE_ROLE_GENERIC;
 }
 
 static void