From a8484b9c07ef10ff09fd7b119fb61d7cd3bc8f48 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Fri, 8 Jul 2022 11:11:38 -0300
Subject: [PATCH] project: Port to GTK4 accessibility framework

This was simple, since few widgets have accessibility properties
manually set. The 'static' role doesn't exist anymore, and GtkLabel
handles everything for us, so we can just drop it.
---
 libmalcontent-ui/user-controls.ui | 11 +----------
 malcontent-control/carousel.ui    | 16 ++++++----------
 malcontent-control/main.ui        |  7 +------
 3 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index 96d38de..43991d6 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -12,11 +12,6 @@
                 <property name="wrap">True</property>
                 <property name="xalign">0.0</property>
                 <property name="yalign">0.0</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject">
-                    <property name="AtkObject::accessible-role">static</property>
-                  </object>
-                </child>
               </object>
             </child>
           </object>
@@ -140,11 +135,7 @@
     </child>
   </template>
 
-  <object class="GtkPopoverMenu" id="oars_popover">
-    <accessibility>
-      <relation target="oars_button" type="popup-for"/>
-    </accessibility>
-  </object>
+  <object class="GtkPopoverMenu" id="oars_popover" />
 
   <menu id="age_menu" />
 
diff --git a/malcontent-control/carousel.ui b/malcontent-control/carousel.ui
index 4e03dad..d6340f9 100644
--- a/malcontent-control/carousel.ui
+++ b/malcontent-control/carousel.ui
@@ -36,11 +36,9 @@
                       <object class="GtkImage">
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-previous-symbolic</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject">
-                            <property name="accessible-name" translatable="yes">Previous Page</property>
-                          </object>
-                        </child>
+                        <accessibility>
+                          <property name="label" translatable="yes">Previous Page</property>
+                        </accessibility>
                       </object>
                     </child>
                     <signal name="clicked" handler="mct_carousel_goto_previous_page" object="MctCarousel" swapped="no"/>
@@ -59,11 +57,9 @@
                       <object class="GtkImage">
                         <property name="icon-size">4</property>
                         <property name="icon_name">go-next-symbolic</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject">
-                            <property name="accessible-name" translatable="yes">Next Page</property>
-                          </object>
-                        </child>
+                        <accessibility>
+                          <property name="label" translatable="yes">Next Page</property>
+                        </accessibility>
                       </object>
                     </child>
                     <signal name="clicked" handler="mct_carousel_goto_next_page" object="MctCarousel" swapped="no"/>
diff --git a/malcontent-control/main.ui b/malcontent-control/main.ui
index 792db28..fd3ab1c 100644
--- a/malcontent-control/main.ui
+++ b/malcontent-control/main.ui
@@ -40,7 +40,7 @@
                     <property name="user-manager">user_manager</property>
                     <property name="show-administrators">False</property>
                     <accessibility>
-                      <relation target="user_controls" type="controller-for"/>
+                      <relation name="controls">user_controls</relation>
                     </accessibility>
                   </object>
                   <packing>
@@ -118,11 +118,6 @@
                     <attributes>
                       <attribute name="scale" value="1.4"/>
                     </attributes>
-                    <child internal-child="accessible">
-                      <object class="AtkObject">
-                        <property name="AtkObject::accessible-role">static</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
               </object>