From 11d7052a40a65bce39ec76ea2cbf1da646e8649e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 18 Jun 2023 07:34:50 -0400
Subject: [PATCH] Revert "dropdown: Shuffle accessible roles around"

This reverts commit 5ec0b07bafaa0d874fb2e7e0674e46f9d8f8378d.

Unfortunately, this makes it so that the focus ends up on
the 'generic' accessible, not the one with the label, and
orca remains quiet.
---
 gtk/gtkdropdown.c     | 5 +----
 gtk/ui/gtkdropdown.ui | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/gtk/gtkdropdown.c b/gtk/gtkdropdown.c
index 105c0817f8..fd07bb1bf2 100644
--- a/gtk/gtkdropdown.c
+++ b/gtk/gtkdropdown.c
@@ -695,10 +695,7 @@ setup_item (GtkSignalListItemFactory *factory,
   label = gtk_label_new (NULL);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_box_append (GTK_BOX (box), label);
-  icon = g_object_new (GTK_TYPE_IMAGE,
-                       "icon-name", "object-select-symbolic",
-                       "accessible-role", GTK_ACCESSIBLE_ROLE_NONE,
-                       NULL);
+  icon = gtk_image_new_from_icon_name ("object-select-symbolic");
   gtk_box_append (GTK_BOX (box), icon);
   gtk_list_item_set_child (list_item, box);
 }
diff --git a/gtk/ui/gtkdropdown.ui b/gtk/ui/gtkdropdown.ui
index 7fc72f2ddc..cf86ccfede 100644
--- a/gtk/ui/gtkdropdown.ui
+++ b/gtk/ui/gtkdropdown.ui
@@ -3,7 +3,6 @@
   <template class="GtkDropDown" parent="GtkWidget">
     <child>
       <object class="GtkToggleButton" id="button">
-        <property name="accessible-role">generic</property>
         <signal name="toggled" handler="button_toggled"/>
         <child>
           <object class="GtkBox">
-- 
2.30.2