[gtk/wip/ebassi/a11y-2: 1059/1060] a11y: Simplify GtkLevelBarAccessible

[Emmanuele Bassi <ebassi src gnome org>]

commit ae9eee30ca789eb0f1cdd42b0c77eb2a333fa833
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed May 27 19:19:55 2020 +0100

    a11y: Simplify GtkLevelBarAccessible
    
    Drop the GtkWidgetAccessible.notify_gtk and AtkObject.initialize
    overrides, and have GtkLevelBar notify the accessible object of value
    changes.

 gtk/a11y/gtklevelbaraccessible.c        | 42 +++++++--------------------------
 gtk/a11y/gtklevelbaraccessibleprivate.h | 29 +++++++++++++++++++++++
 gtk/gtklevelbar.c                       | 11 +++++++--
 3 files changed, 47 insertions(+), 35 deletions(-)
---
diff --git a/gtk/a11y/gtklevelbaraccessible.c b/gtk/a11y/gtklevelbaraccessible.c
index f4fd19d620..e8dedd9fa4 100644
--- a/gtk/a11y/gtklevelbaraccessible.c
+++ b/gtk/a11y/gtklevelbaraccessible.c
@@ -18,56 +18,32 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <gtk/gtk.h>
-#include "gtklevelbaraccessible.h"
+#include "gtklevelbaraccessibleprivate.h"
+
+#include "gtklevelbar.h"
 
+#include <string.h>
 
 static void atk_value_interface_init (AtkValueIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GtkLevelBarAccessible, gtk_level_bar_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
 
-static void
-gtk_level_bar_accessible_initialize (AtkObject *obj,
-                                       gpointer  data)
+void
+gtk_level_bar_accessible_update_value (GtkLevelBarAccessible *self)
 {
-  ATK_OBJECT_CLASS (gtk_level_bar_accessible_parent_class)->initialize (obj, data);
-
-  obj->role = ATK_ROLE_LEVEL_BAR;
+  g_object_notify (G_OBJECT (self), "accessible-value");
 }
 
-static void
-gtk_level_bar_accessible_notify_gtk (GObject    *obj,
-                                       GParamSpec *pspec)
-{
-  GtkWidget *widget = GTK_WIDGET (obj);
-  GtkLevelBarAccessible *level_bar = GTK_LEVEL_BAR_ACCESSIBLE (gtk_widget_get_accessible (widget));
-
-  if (strcmp (pspec->name, "value") == 0)
-    {
-      g_object_notify (G_OBJECT (level_bar), "accessible-value");
-    }
-  else
-    GTK_WIDGET_ACCESSIBLE_CLASS (gtk_level_bar_accessible_parent_class)->notify_gtk (obj, pspec);
-}
-
-
-
 static void
 gtk_level_bar_accessible_class_init (GtkLevelBarAccessibleClass *klass)
 {
-  AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-  GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass;
-
-  widget_class->notify_gtk = gtk_level_bar_accessible_notify_gtk;
-
-  class->initialize = gtk_level_bar_accessible_initialize;
 }
 
 static void
-gtk_level_bar_accessible_init (GtkLevelBarAccessible *button)
+gtk_level_bar_accessible_init (GtkLevelBarAccessible *self)
 {
+  ATK_OBJECT (self)->role = ATK_ROLE_LEVEL_BAR;
 }
 
 static void
diff --git a/gtk/a11y/gtklevelbaraccessibleprivate.h b/gtk/a11y/gtklevelbaraccessibleprivate.h
new file mode 100644
index 0000000000..b350c447d2
--- /dev/null
+++ b/gtk/a11y/gtklevelbaraccessibleprivate.h
@@ -0,0 +1,29 @@
+/* gtklevelbaraccessibleprivate.h: GtkLevelBarAccessible private API
+ *
+ * Copyright 2020  GNOME Foundation
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "gtklevelbaraccessible.h"
+
+G_BEGIN_DECLS
+
+void    gtk_level_bar_accessible_update_value   (GtkLevelBarAccessible *self);
+
+G_END_DECLS
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index b94e02bcdd..96f621126a 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -133,11 +133,11 @@
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 
+#include "a11y/gtklevelbaraccessibleprivate.h"
+
 #include <math.h>
 #include <stdlib.h>
 
-#include "a11y/gtklevelbaraccessible.h"
-
 #include "fallback-c89.c"
 
 enum {
@@ -1123,8 +1123,15 @@ static void
 gtk_level_bar_set_value_internal (GtkLevelBar *self,
                                   gdouble      value)
 {
+  AtkObject *accessible = _gtk_widget_peek_accessible (GTK_WIDGET (self));
+
   self->cur_value = value;
+
+  if (accessible != NULL)
+    gtk_level_bar_accessible_update_value (GTK_LEVEL_BAR_ACCESSIBLE (accessible));
+
   g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_VALUE]);
+
   gtk_widget_queue_allocate (GTK_WIDGET (self->trough_widget));
 }