[nautilus/wip/oholy/gnome-42: 16/41] Revert "general: Disable a11y code"




commit 7f343d0f3a2dbf5ad24f071fe5d8c57612f440ff
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Feb 11 14:25:02 2022 +0100

    Revert "general: Disable a11y code"
    
    This reverts commit 35384f290b7948e995ba78fa31ea63a747f647d0.

 src/nautilus-file-operations.c   | 2 --
 src/nautilus-files-view.c        | 4 ----
 src/nautilus-list-view.c         | 4 ----
 src/nautilus-properties-window.c | 4 ----
 4 files changed, 14 deletions(-)
---
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 7af3865aa..25373e47b 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -3032,9 +3032,7 @@ create_empty_trash_prompt (GtkWindow *parent_window)
                             _("Empty _Trash"), GTK_RESPONSE_ACCEPT, NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
     gtk_window_set_title (GTK_WINDOW (dialog), "");
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     atk_object_set_role (gtk_widget_get_accessible (dialog), ATK_ROLE_ALERT);
-#endif
 
     return dialog;
 }
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index ac2c0525b..3a423feae 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -9503,9 +9503,7 @@ nautilus_files_view_init (NautilusFilesView *view)
 {
     NautilusFilesViewPrivate *priv;
     GtkBuilder *builder;
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     AtkObject *atk_object;
-#endif
     NautilusDirectory *scripts_directory;
     NautilusDirectory *templates_directory;
     gchar *templates_uri;
@@ -9725,12 +9723,10 @@ nautilus_files_view_init (NautilusFilesView *view)
 
     priv->in_destruction = FALSE;
 
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     /* Accessibility */
     atk_object = gtk_widget_get_accessible (GTK_WIDGET (view));
     atk_object_set_name (atk_object, _("Content View"));
     atk_object_set_description (atk_object, _("View of the current folder"));
-#endif
 
     priv->view_action_group = G_ACTION_GROUP (g_simple_action_group_new ());
     g_action_map_add_action_entries (G_ACTION_MAP (priv->view_action_group),
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 74c8e6f4d..1f8ac01fa 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -1983,9 +1983,7 @@ create_and_set_up_tree_view (NautilusListView *view)
 {
     GtkCellRenderer *cell;
     GtkTreeViewColumn *column;
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     AtkObject *atk_obj;
-#endif
     GList *nautilus_columns;
     GList *l;
     gchar **default_column_order, **default_visible_columns;
@@ -2301,10 +2299,8 @@ create_and_set_up_tree_view (NautilusListView *view)
     gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (content_widget),
                                    GTK_WIDGET (view->details->tree_view));
 
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     atk_obj = gtk_widget_get_accessible (GTK_WIDGET (view->details->tree_view));
     atk_object_set_name (atk_obj, _("List View"));
-#endif
 
     g_strfreev (default_visible_columns);
     g_strfreev (default_column_order);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index c01c471ce..9b9a9bd7f 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -3163,12 +3163,10 @@ static void
 setup_execute_checkbox_with_label (NautilusPropertiesWindow *self,
                                    guint32                   permission_to_check)
 {
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     gboolean a11y_enabled;
     GtkLabel *label_for;
 
     label_for = GTK_LABEL (self->execute_label);
-#endif
     gtk_widget_show (self->execute_label);
     gtk_widget_show (self->execute_checkbox);
 
@@ -3189,7 +3187,6 @@ setup_execute_checkbox_with_label (NautilusPropertiesWindow *self,
                              self,
                              0);
 
-#if 0 && NAUTILUS_A11Y_NEEDS_GTK4_REIMPLEMENTATION
     a11y_enabled = GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (self->execute_checkbox));
     if (a11y_enabled && label_for != NULL)
     {
@@ -3205,7 +3202,6 @@ setup_execute_checkbox_with_label (NautilusPropertiesWindow *self,
         /* Create the widget -> label relation */
         atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
     }
-#endif
 }
 
 enum


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]