commit 2f8d7bf
hovercats
·
2024-05-02 16:22:26 +0000 UTC
parent 83ad88a
gtk+3: make patches more consistent merge atk/accessability patches and remove firefox patch, as we dont need it
6 files changed,
+732,
-1142
+2,
-4
1@@ -1,5 +1,3 @@
2 46777a428699d6e2643a6d4c0929168912b760011706cb95b67807bd777e005fe5
3-8b8bf563e74f720990030791f8e408db6099813a6290c38ab812231dbd10eb0cb8
4-763400831b2abe5eff95609826dc6769ab2a742d68d4ffd0b4a7209a7f1be2cdaa
5-09d6f9e59422724a1fead2bd2103ab0569f823da04e1411a338ae9892bedb2652e
6-05cf248d5d857ac14fd5904671ed53d08f125ebc74f0e81f270fb8186ddb000540
7+76c0117c066c8924cf5fcb59801818c6c2019e75ed69d1324007998a98fbf90989
8+b0765be180e7c013ba55295ae1a954f515452309ce8d9df51608aa8b9c56b7ad99
R repo/gtk+3/patches/01-no-fribidi.patch =>
repo/gtk+3/patches/0001-remove-fribidi-dependency.patch
+24,
-8
1@@ -1,5 +1,18 @@
2+From 298b189f536e0bf8d7c32d141ef5caefaf086e5c Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Thu, 2 May 2024 18:13:50 +0200
5+Subject: [PATCH 1/2] remove fribidi dependency
6+
7+---
8+ gdk/gdk.c | 12 ------------
9+ gdk/meson.build | 1 -
10+ gtk/gtkpango.c | 12 ------------
11+ gtk/meson.build | 1 -
12+ meson.build | 8 ++------
13+ 5 files changed, 2 insertions(+), 32 deletions(-)
14+
15 diff --git a/gdk/gdk.c b/gdk/gdk.c
16-index f0869a6..2f3c039 100644
17+index 83672d8..2536b53 100644
18 --- a/gdk/gdk.c
19 +++ b/gdk/gdk.c
20 @@ -44,7 +44,6 @@
21@@ -71,10 +84,10 @@ index aaac4cc..a76ad57 100644
22 }
23
24 diff --git a/gtk/meson.build b/gtk/meson.build
25-index 79f4f0d..be51997 100644
26+index ea866d8..033c6ab 100644
27 --- a/gtk/meson.build
28 +++ b/gtk/meson.build
29-@@ -836,7 +836,6 @@ gtk_deps = [
30+@@ -840,7 +840,6 @@ gtk_deps = [
31 pango_dep,
32 pangoft_dep,
33 harfbuzz_dep,
34@@ -83,10 +96,10 @@ index 79f4f0d..be51997 100644
35 cairo_dep,
36 fontconfig_dep,
37 diff --git a/meson.build b/meson.build
38-index c599843..967a022 100644
39+index 7bf5ea4..33bcb28 100644
40 --- a/meson.build
41 +++ b/meson.build
42-@@ -25,7 +25,6 @@ endif
43+@@ -26,7 +26,6 @@ endif
44
45 glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req)
46 pango_req = '>= 1.41.0'
47@@ -94,7 +107,7 @@ index c599843..967a022 100644
48 atk_req = '>= 2.35.1'
49 at_spi2_atk_req = '>= 2.15.1'
50 cairo_req = '>= 1.14.0'
51-@@ -404,8 +403,6 @@ endif
52+@@ -400,8 +399,6 @@ endif
53
54 pango_dep = dependency('pango', version: pango_req,
55 fallback : ['pango', 'libpango_dep'])
56@@ -103,7 +116,7 @@ index c599843..967a022 100644
57
58 # Require PangoFT2 if on X11 or wayland
59 require_pangoft2 = wayland_enabled or x11_enabled
60-@@ -927,8 +924,7 @@ endif
61+@@ -913,8 +910,7 @@ endif
62
63 pkgconf.set('GDK_PRIVATE_PACKAGES',
64 ' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends +
65@@ -113,7 +126,7 @@ index c599843..967a022 100644
66
67 gtk_packages = ' '.join([
68 atk_dep.name(), atk_req,
69-@@ -941,7 +937,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages)
70+@@ -927,7 +923,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages)
71 # Requires.private
72 pc_gdk_extra_libs += cairo_libs
73
74@@ -122,3 +135,6 @@ index c599843..967a022 100644
75 if wayland_enabled or x11_enabled
76 gtk_private_packages += ['pangoft2']
77 endif
78+--
79+2.44.0
80+
R repo/gtk+3/patches/03-no-accessibility.patch =>
repo/gtk+3/patches/0002-remove-need-for-atk.patch
+704,
-982
1@@ -1,3 +1,124 @@
2+From bfff2564b939ff39fd50da0f64fb65566a85243d Mon Sep 17 00:00:00 2001
3+From: hovercats <hovercatswithlasereyes@protonmail.com>
4+Date: Thu, 2 May 2024 18:19:07 +0200
5+Subject: [PATCH 2/2] remove need for atk
6+
7+this removes accessability altogether.
8+---
9+ gtk/a11y/gtkbooleancellaccessible.h | 1 -
10+ gtk/a11y/gtkcellaccessible.h | 4 -
11+ gtk/a11y/gtkcontaineraccessibleprivate.h | 2 -
12+ gtk/a11y/gtkimagecellaccessible.h | 1 -
13+ gtk/a11y/gtkplugaccessible.h | 44 --
14+ gtk/a11y/gtkrenderercellaccessible.h | 4 -
15+ gtk/a11y/gtktextcellaccessible.h | 1 -
16+ gtk/a11y/gtktoplevelaccessible.h | 2 -
17+ gtk/a11y/gtkwidgetaccessible.h | 4 -
18+ gtk/deprecated/gtkarrow.c | 2 -
19+ gtk/deprecated/gtkcolorsel.c | 36 --
20+ gtk/deprecated/gtkcolorseldialog.c | 2 -
21+ gtk/deprecated/gtkfontsel.c | 45 --
22+ gtk/deprecated/gtkhsv.c | 2 -
23+ gtk/deprecated/gtktearoffmenuitem.c | 2 -
24+ gtk/gtk-autocleanups.h | 1 -
25+ gtk/gtk.h | 1 -
26+ gtk/gtkaccellabel.c | 2 -
27+ gtk/gtkaccessible.c | 185 --------
28+ gtk/gtkaccessible.h | 15 -
29+ gtk/gtkactionbar.c | 1 -
30+ gtk/gtkassistant.c | 71 ----
31+ gtk/gtkbox.c | 1 -
32+ gtk/gtkbutton.c | 1 -
33+ gtk/gtkcalendar.c | 1 -
34+ gtk/gtkcellrenderer.c | 37 --
35+ gtk/gtkcellrendererpixbuf.c | 4 -
36+ gtk/gtkcellrenderertext.c | 2 -
37+ gtk/gtkcellrenderertoggle.c | 2 -
38+ gtk/gtkcheckbutton.c | 1 -
39+ gtk/gtkcheckmenuitem.c | 1 -
40+ gtk/gtkcolorchooserwidget.c | 11 -
41+ gtk/gtkcolorplane.c | 9 -
42+ gtk/gtkcolorscale.c | 12 -
43+ gtk/gtkcolorswatch.c | 1 -
44+ gtk/gtkcombobox.c | 30 --
45+ gtk/gtkcombobox.h | 2 -
46+ gtk/gtkcontainer.c | 6 -
47+ gtk/gtkdialog.c | 2 -
48+ gtk/gtkdrawingarea.c | 2 -
49+ gtk/gtkentry.c | 1 -
50+ gtk/gtkentrycompletion.c | 18 -
51+ gtk/gtkexpander.c | 1 -
52+ gtk/gtkfilechooserdialog.c | 2 -
53+ gtk/gtkfilechooserwidget.c | 6 -
54+ gtk/gtkflowbox.c | 4 -
55+ gtk/gtkfontchooserdialog.c | 2 -
56+ gtk/gtkfontchooserwidget.c | 2 -
57+ gtk/gtkframe.c | 1 -
58+ gtk/gtkglarea.c | 2 -
59+ gtk/gtkheaderbar.c | 19 -
60+ gtk/gtkiconview.c | 39 --
61+ gtk/gtkimage.c | 1 -
62+ gtk/gtkinfobar.c | 38 --
63+ gtk/gtklabel.c | 12 -
64+ gtk/gtklevelbar.c | 1 -
65+ gtk/gtklinkbutton.c | 1 -
66+ gtk/gtklistbox.c | 6 -
67+ gtk/gtklockbutton.c | 4 -
68+ gtk/gtkmain.c | 15 -
69+ gtk/gtkmenu.c | 1 -
70+ gtk/gtkmenubar.c | 1 -
71+ gtk/gtkmenubutton.c | 1 -
72+ gtk/gtkmenuitem.c | 1 -
73+ gtk/gtkmenushell.c | 2 -
74+ gtk/gtkmessagedialog.c | 11 -
75+ gtk/gtkmodelbutton.c | 31 --
76+ gtk/gtkmodelmenuitem.c | 10 -
77+ gtk/gtknotebook.c | 1 -
78+ gtk/gtkpaned.c | 1 -
79+ gtk/gtkpango.c | 516 -----------------------
80+ gtk/gtkpango.h | 13 -
81+ gtk/gtkpathbar.c | 3 -
82+ gtk/gtkplug.c | 2 -
83+ gtk/gtkpopover.c | 1 -
84+ gtk/gtkprogressbar.c | 1 -
85+ gtk/gtkradiobutton.c | 1 -
86+ gtk/gtkradiomenuitem.c | 2 -
87+ gtk/gtkrange.c | 2 -
88+ gtk/gtkscale.c | 1 -
89+ gtk/gtkscalebutton.c | 1 -
90+ gtk/gtkscrollbar.c | 1 -
91+ gtk/gtkscrolledwindow.c | 1 -
92+ gtk/gtksearchentry.c | 6 -
93+ gtk/gtkseparator.c | 1 -
94+ gtk/gtkseparatormenuitem.c | 1 -
95+ gtk/gtksocket.c | 2 -
96+ gtk/gtkspinbutton.c | 1 -
97+ gtk/gtkspinner.c | 1 -
98+ gtk/gtkstack.c | 5 -
99+ gtk/gtkstatusbar.c | 1 -
100+ gtk/gtkstylecontext.c | 57 ---
101+ gtk/gtkstylecontext.h | 1 -
102+ gtk/gtkstylecontextprivate.h | 5 -
103+ gtk/gtkswitch.c | 7 -
104+ gtk/gtktextbuffer.c | 265 ------------
105+ gtk/gtktextbufferprivate.h | 3 -
106+ gtk/gtktextview.c | 2 -
107+ gtk/gtktogglebutton.c | 1 -
108+ gtk/gtktoolbar.c | 2 -
109+ gtk/gtktoolbutton.c | 3 -
110+ gtk/gtktooltipwindow.c | 1 -
111+ gtk/gtktreeselection.c | 2 -
112+ gtk/gtktreeview.c | 42 --
113+ gtk/gtktreeviewcolumn.c | 6 -
114+ gtk/gtkviewport.c | 2 -
115+ gtk/gtkvolumebutton.c | 8 -
116+ gtk/gtkwidget.c | 469 --------------------
117+ gtk/gtkwidget.h | 15 -
118+ gtk/gtkwidgetprivate.h | 4 -
119+ 110 files changed, 2246 deletions(-)
120+
121+diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h
122+index ba344e6..6300cfa 100644
123 --- a/gtk/a11y/gtkbooleancellaccessible.h
124 +++ b/gtk/a11y/gtkbooleancellaccessible.h
125 @@ -22,7 +22,6 @@
126@@ -8,6 +129,8 @@
127 #include <gtk/a11y/gtkrenderercellaccessible.h>
128
129 G_BEGIN_DECLS
130+diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h
131+index 1195a38..0a80c5f 100644
132 --- a/gtk/a11y/gtkcellaccessible.h
133 +++ b/gtk/a11y/gtkcellaccessible.h
134 @@ -22,7 +22,6 @@
135@@ -18,7 +141,7 @@
136 #include <gtk/gtk.h>
137
138 G_BEGIN_DECLS
139-@@ -40,14 +39,11 @@
140+@@ -40,14 +39,11 @@ typedef struct _GtkCellAccessiblePrivate GtkCellAccessiblePrivate;
141
142 struct _GtkCellAccessible
143 {
144@@ -33,6 +156,8 @@
145 void (*update_cache) (GtkCellAccessible *cell,
146 gboolean emit_signal);
147 };
148+diff --git a/gtk/a11y/gtkcontaineraccessibleprivate.h b/gtk/a11y/gtkcontaineraccessibleprivate.h
149+index 4d02a73..baf5531 100644
150 --- a/gtk/a11y/gtkcontaineraccessibleprivate.h
151 +++ b/gtk/a11y/gtkcontaineraccessibleprivate.h
152 @@ -23,10 +23,8 @@
153@@ -46,6 +171,8 @@
154 gint index);
155 void _gtk_container_accessible_add (GtkWidget *parent,
156 GtkWidget *child);
157+diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
158+index 5ab1c22..bd0ee82 100644
159 --- a/gtk/a11y/gtkimagecellaccessible.h
160 +++ b/gtk/a11y/gtkimagecellaccessible.h
161 @@ -22,7 +22,6 @@
162@@ -56,6 +183,61 @@
163 #include <gtk/a11y/gtkrenderercellaccessible.h>
164
165 G_BEGIN_DECLS
166+diff --git a/gtk/a11y/gtkplugaccessible.h b/gtk/a11y/gtkplugaccessible.h
167+index 5be8fe4..b9840af 100644
168+--- a/gtk/a11y/gtkplugaccessible.h
169++++ b/gtk/a11y/gtkplugaccessible.h
170+@@ -24,48 +24,4 @@
171+
172+ #include <gtk/a11y/gtkwindowaccessible.h>
173+
174+-#if ATK_CHECK_VERSION(2,35,1)
175+-
176+-#define GTK_HAVE_ATK_PLUG_SET_CHILD
177+-
178+-G_BEGIN_DECLS
179+-
180+-#define GTK_TYPE_PLUG_ACCESSIBLE (gtk_plug_accessible_get_type ())
181+-#define GTK_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessible))
182+-#define GTK_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
183+-#define GTK_IS_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG_ACCESSIBLE))
184+-#define GTK_IS_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG_ACCESSIBLE))
185+-#define GTK_PLUG_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
186+-
187+-typedef struct _GtkPlugAccessible GtkPlugAccessible;
188+-typedef struct _GtkPlugAccessibleClass GtkPlugAccessibleClass;
189+-typedef struct _GtkPlugAccessiblePrivate GtkPlugAccessiblePrivate;
190+-
191+-/**
192+- * GtkPlugAccessible:
193+- *
194+- * Since: 3.24.30
195+- */
196+-struct _GtkPlugAccessible
197+-{
198+- GtkWindowAccessible parent;
199+-
200+- GtkPlugAccessiblePrivate *priv;
201+-};
202+-
203+-struct _GtkPlugAccessibleClass
204+-{
205+- GtkWindowAccessibleClass parent_class;
206+-};
207+-
208+-GDK_AVAILABLE_IN_ALL
209+-GType gtk_plug_accessible_get_type (void);
210+-
211+-GDK_AVAILABLE_IN_ALL
212+-gchar *gtk_plug_accessible_get_id (GtkPlugAccessible *plug);
213+-
214+-G_END_DECLS
215+-
216+-#endif /* ATK_CHECK_VERSION(2,35,1) */
217+-
218+ #endif /* __GTK_PLUG_ACCESSIBLE_H__ */
219+diff --git a/gtk/a11y/gtkrenderercellaccessible.h b/gtk/a11y/gtkrenderercellaccessible.h
220+index ac39d89..2b97029 100644
221 --- a/gtk/a11y/gtkrenderercellaccessible.h
222 +++ b/gtk/a11y/gtkrenderercellaccessible.h
223 @@ -22,7 +22,6 @@
224@@ -66,16 +248,18 @@
225 #include <gtk/a11y/gtkcellaccessible.h>
226
227 G_BEGIN_DECLS
228-@@ -52,9 +51,6 @@
229-
230+@@ -53,9 +52,6 @@ struct _GtkRendererCellAccessibleClass
231 GDK_AVAILABLE_IN_ALL
232 GType gtk_renderer_cell_accessible_get_type (void);
233--
234+
235 -GDK_AVAILABLE_IN_ALL
236 -AtkObject *gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer);
237-
238+-
239 G_END_DECLS
240
241+ #endif /* __GTK_RENDERER_CELL_ACCESSIBLE_H__ */
242+diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h
243+index 16a63b7..069fd42 100644
244 --- a/gtk/a11y/gtktextcellaccessible.h
245 +++ b/gtk/a11y/gtktextcellaccessible.h
246 @@ -22,7 +22,6 @@
247@@ -86,6 +270,8 @@
248 #include <gtk/a11y/gtkrenderercellaccessible.h>
249
250 G_BEGIN_DECLS
251+diff --git a/gtk/a11y/gtktoplevelaccessible.h b/gtk/a11y/gtktoplevelaccessible.h
252+index 9c782b8..59d5372 100644
253 --- a/gtk/a11y/gtktoplevelaccessible.h
254 +++ b/gtk/a11y/gtktoplevelaccessible.h
255 @@ -22,8 +22,6 @@
256@@ -97,9 +283,11 @@
257 G_BEGIN_DECLS
258
259 #define GTK_TYPE_TOPLEVEL_ACCESSIBLE (gtk_toplevel_accessible_get_type ())
260+diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
261+index 37fd45b..a623081 100644
262 --- a/gtk/a11y/gtkwidgetaccessible.h
263 +++ b/gtk/a11y/gtkwidgetaccessible.h
264-@@ -39,15 +39,11 @@
265+@@ -39,15 +39,11 @@ typedef struct _GtkWidgetAccessiblePrivate GtkWidgetAccessiblePrivate;
266
267 struct _GtkWidgetAccessible
268 {
269@@ -115,9 +303,11 @@
270 /*
271 * Signal handler for notify signal on GTK widget
272 */
273+diff --git a/gtk/deprecated/gtkarrow.c b/gtk/deprecated/gtkarrow.c
274+index 3312ffc..e22f52c 100644
275 --- a/gtk/deprecated/gtkarrow.c
276 +++ b/gtk/deprecated/gtkarrow.c
277-@@ -139,8 +139,6 @@
278+@@ -139,8 +139,6 @@ gtk_arrow_class_init (GtkArrowClass *class)
279 P_("Amount of space used up by arrow"),
280 0.0, 1.0, 0.7,
281 GTK_PARAM_READABLE));
282@@ -126,9 +316,11 @@
283 }
284
285 static void
286+diff --git a/gtk/deprecated/gtkcolorsel.c b/gtk/deprecated/gtkcolorsel.c
287+index 8152983..af1e9db 100644
288 --- a/gtk/deprecated/gtkcolorsel.c
289 +++ b/gtk/deprecated/gtkcolorsel.c
290-@@ -206,10 +206,6 @@
291+@@ -206,10 +206,6 @@ static void default_noscreen_change_palette_func (const GdkColor *colo
292 static void default_change_palette_func (GdkScreen *screen,
293 const GdkColor *colors,
294 gint n_colors);
295@@ -139,7 +331,7 @@
296
297 static void hsv_changed (GtkWidget *hsv,
298 gpointer data);
299-@@ -398,7 +394,6 @@
300+@@ -398,7 +394,6 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
301 GtkWidget *picker_image;
302 gint i, j;
303 GtkColorSelectionPrivate *priv;
304@@ -147,7 +339,7 @@
305 GList *focus_chain = NULL;
306
307 gtk_orientable_set_orientation (GTK_ORIENTABLE (colorsel),
308-@@ -572,14 +567,6 @@
309+@@ -572,14 +567,6 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
310 gtk_widget_hide (priv->palette_frame);
311 }
312
313@@ -162,11 +354,10 @@
314 gtk_widget_pop_composite_child ();
315 }
316
317-@@ -3056,27 +3043,4 @@
318- change_palette_hook = func;
319+@@ -3057,26 +3044,3 @@ gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChange
320
321 return old;
322--}
323+ }
324 -
325 -static void
326 -make_control_relations (AtkObject *atk_obj,
327@@ -189,10 +380,12 @@
328 - make_control_relations (atk_obj, priv->red_spinbutton);
329 - make_control_relations (atk_obj, priv->green_spinbutton);
330 - make_control_relations (atk_obj, priv->blue_spinbutton);
331- }
332+-}
333+diff --git a/gtk/deprecated/gtkcolorseldialog.c b/gtk/deprecated/gtkcolorseldialog.c
334+index 7ff28ec..19daf9d 100644
335 --- a/gtk/deprecated/gtkcolorseldialog.c
336 +++ b/gtk/deprecated/gtkcolorseldialog.c
337-@@ -158,8 +158,6 @@
338+@@ -158,8 +158,6 @@ gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
339 P_("The help button of the dialog."),
340 GTK_TYPE_WIDGET,
341 G_PARAM_READABLE));
342@@ -201,6 +394,8 @@
343 }
344
345 static void
346+diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
347+index 7812e75..67e3a8e 100644
348 --- a/gtk/deprecated/gtkfontsel.c
349 +++ b/gtk/deprecated/gtkfontsel.c
350 @@ -35,8 +35,6 @@
351@@ -212,7 +407,7 @@
352 #include "gtkbutton.h"
353 #include "gtkcellrenderertext.h"
354 #include "gtkentry.h"
355-@@ -335,7 +333,6 @@
356+@@ -335,7 +333,6 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
357 GtkListStore *model;
358 GtkTreeViewColumn *column;
359 GList *focus_chain = NULL;
360@@ -220,7 +415,7 @@
361
362 fontsel->priv = gtk_font_selection_get_instance_private (fontsel);
363 priv = fontsel->priv;
364-@@ -528,47 +525,7 @@
365+@@ -528,46 +525,6 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
366
367 g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)), "changed",
368 G_CALLBACK (gtk_font_selection_select_size), fontsel);
369@@ -234,7 +429,7 @@
370 - AtkRelationSet *relation_set;
371 - AtkRelation *relation;
372 - AtkObject *obj_array[1];
373-
374+-
375 - atk_label = gtk_widget_get_accessible (label);
376 - relation_set = atk_object_ref_relation_set (atk_obj);
377 - relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_LABELLED_BY);
378@@ -264,11 +459,10 @@
379 - }
380 - g_object_unref (relation_set);
381 - }
382--
383+
384 vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
385 gtk_widget_show (vbox);
386- gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE, 0);
387-@@ -1651,8 +1608,6 @@
388+@@ -1651,8 +1608,6 @@ static void
389 gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass)
390 {
391 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
392@@ -277,9 +471,11 @@
393 }
394
395 static void
396+diff --git a/gtk/deprecated/gtkhsv.c b/gtk/deprecated/gtkhsv.c
397+index 6e30d5e..f76969f 100644
398 --- a/gtk/deprecated/gtkhsv.c
399 +++ b/gtk/deprecated/gtkhsv.c
400-@@ -160,8 +160,6 @@
401+@@ -160,8 +160,6 @@ gtk_hsv_class_init (GtkHSVClass *class)
402 widget_class->focus = gtk_hsv_focus;
403 widget_class->grab_broken_event = gtk_hsv_grab_broken;
404
405@@ -288,9 +484,11 @@
406 hsv_class->move = gtk_hsv_move;
407
408 hsv_signals[CHANGED] =
409+diff --git a/gtk/deprecated/gtktearoffmenuitem.c b/gtk/deprecated/gtktearoffmenuitem.c
410+index 87fdb80..2cbced9 100644
411 --- a/gtk/deprecated/gtktearoffmenuitem.c
412 +++ b/gtk/deprecated/gtktearoffmenuitem.c
413-@@ -110,8 +110,6 @@
414+@@ -110,8 +110,6 @@ gtk_tearoff_menu_item_class_init (GtkTearoffMenuItemClass *klass)
415 widget_class->get_preferred_height = gtk_tearoff_menu_item_get_preferred_height;
416 widget_class->parent_set = gtk_tearoff_menu_item_parent_set;
417
418@@ -299,6 +497,8 @@
419 menu_item_class->activate = gtk_tearoff_menu_item_activate;
420 }
421
422+diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
423+index 5c942ce..70f2d5f 100644
424 --- a/gtk/gtk-autocleanups.h
425 +++ b/gtk/gtk-autocleanups.h
426 @@ -21,7 +21,6 @@
427@@ -309,6 +509,8 @@
428 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionBar, g_object_unref)
429 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionable, g_object_unref)
430 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAdjustment, g_object_unref)
431+diff --git a/gtk/gtk.h b/gtk/gtk.h
432+index c08454c..5d48f88 100644
433 --- a/gtk/gtk.h
434 +++ b/gtk/gtk.h
435 @@ -32,7 +32,6 @@
436@@ -319,9 +521,11 @@
437 #include <gtk/gtkactionable.h>
438 #include <gtk/gtkactionbar.h>
439 #include <gtk/gtkadjustment.h>
440+diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
441+index 75b27a8..f734783 100644
442 --- a/gtk/gtkaccellabel.c
443 +++ b/gtk/gtkaccellabel.c
444-@@ -167,8 +167,6 @@
445+@@ -167,8 +167,6 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
446 widget_class->get_preferred_width = gtk_accel_label_get_preferred_width;
447 widget_class->destroy = gtk_accel_label_destroy;
448
449@@ -330,14 +534,16 @@
450 class->signal_quote1 = g_strdup ("<:");
451 class->signal_quote2 = g_strdup (":>");
452
453+diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
454+index 9efbb0c..e16fb88 100644
455 --- a/gtk/gtkaccessible.c
456 +++ b/gtk/gtkaccessible.c
457-@@ -50,177 +50,8 @@
458+@@ -50,175 +50,6 @@ enum {
459 PROP_WIDGET
460 };
461
462 -static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
463-
464+-
465 -G_DEFINE_TYPE_WITH_PRIVATE (GtkAccessible, gtk_accessible, ATK_TYPE_OBJECT)
466 -
467 -static void
468@@ -445,7 +651,7 @@
469 - G_PARAM_READWRITE));
470 -}
471 -
472- /**
473+-/**
474 - * gtk_accessible_set_widget:
475 - * @accessible: a #GtkAccessible
476 - * @widget: (allow-none): a #GtkWidget or %NULL to unset
477@@ -505,12 +711,10 @@
478 -
479 - return accessible->priv->widget;
480 -}
481--
482--/**
483+
484+ /**
485 * gtk_accessible_connect_widget_destroyed:
486- * @accessible: a #GtkAccessible
487- *
488-@@ -242,19 +73,3 @@
489+@@ -242,19 +73,3 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
490 class->connect_widget_destroyed (accessible);
491 }
492
493@@ -530,6 +734,8 @@
494 - g_signal_connect (priv->widget, "destroy",
495 - G_CALLBACK (gtk_accessible_widget_destroyed), accessible);
496 -}
497+diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
498+index 9c2229b..85a198d 100644
499 --- a/gtk/gtkaccessible.h
500 +++ b/gtk/gtkaccessible.h
501 @@ -22,34 +22,22 @@
502@@ -567,19 +773,21 @@
503 void (*connect_widget_destroyed) (GtkAccessible *accessible);
504
505 void (*widget_set) (GtkAccessible *accessible);
506-@@ -58,9 +46,6 @@
507- void (*_gtk_reserved3) (void);
508+@@ -59,9 +47,6 @@ struct _GtkAccessibleClass
509 void (*_gtk_reserved4) (void);
510 };
511--
512+
513 -GDK_AVAILABLE_IN_ALL
514 -GType gtk_accessible_get_type (void) G_GNUC_CONST;
515-
516+-
517 GDK_AVAILABLE_IN_ALL
518 void gtk_accessible_set_widget (GtkAccessible *accessible,
519+ GtkWidget *widget);
520+diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
521+index effd494..ea86299 100644
522 --- a/gtk/gtkactionbar.c
523 +++ b/gtk/gtkactionbar.c
524-@@ -351,7 +351,6 @@
525+@@ -351,7 +351,6 @@ gtk_action_bar_class_init (GtkActionBarClass *klass)
526 gtk_widget_class_bind_template_child_private (widget_class, GtkActionBar, box);
527 gtk_widget_class_bind_template_child_private (widget_class, GtkActionBar, revealer);
528
529@@ -587,6 +795,8 @@
530 gtk_widget_class_set_css_name (widget_class, "actionbar");
531 }
532
533+diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
534+index bad21b3..4a09a7e 100644
535 --- a/gtk/gtkassistant.c
536 +++ b/gtk/gtkassistant.c
537 @@ -58,8 +58,6 @@
538@@ -598,7 +808,7 @@
539 #include "gtkassistant.h"
540
541 #include "gtkbutton.h"
542-@@ -405,8 +403,6 @@
543+@@ -405,8 +403,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
544 widget_class->unmap = gtk_assistant_unmap;
545 widget_class->delete_event = gtk_assistant_delete_event;
546
547@@ -607,7 +817,7 @@
548 container_class->add = gtk_assistant_add;
549 container_class->remove = gtk_assistant_remove;
550 container_class->set_child_property = gtk_assistant_set_child_property;
551-@@ -2534,76 +2530,9 @@
552+@@ -2534,76 +2530,9 @@ gtk_assistant_commit (GtkAssistant *assistant)
553 typedef GtkWindowAccessible GtkAssistantAccessible;
554 typedef GtkWindowAccessibleClass GtkAssistantAccessibleClass;
555
556@@ -684,9 +894,11 @@
557 }
558
559 static void
560+diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
561+index c372f9c..161bb54 100644
562 --- a/gtk/gtkbox.c
563 +++ b/gtk/gtkbox.c
564-@@ -370,7 +370,6 @@
565+@@ -370,7 +370,6 @@ gtk_box_class_init (GtkBoxClass *class)
566
567 gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, child_props);
568
569@@ -694,9 +906,11 @@
570 gtk_widget_class_set_css_name (widget_class, "box");
571 }
572
573+diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
574+index 26b7ffb..c9744a8 100644
575 --- a/gtk/gtkbutton.c
576 +++ b/gtk/gtkbutton.c
577-@@ -630,7 +630,6 @@
578+@@ -630,7 +630,6 @@ gtk_button_class_init (GtkButtonClass *klass)
579 2,
580 GTK_PARAM_READABLE | G_PARAM_DEPRECATED));
581
582@@ -704,9 +918,11 @@
583 gtk_widget_class_set_css_name (widget_class, "button");
584 }
585
586+diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
587+index 5f1a5d5..2c2e141 100644
588 --- a/gtk/gtkcalendar.c
589 +++ b/gtk/gtkcalendar.c
590-@@ -680,7 +680,6 @@
591+@@ -680,7 +680,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
592 NULL,
593 G_TYPE_NONE, 0);
594
595@@ -714,9 +930,11 @@
596 gtk_widget_class_set_css_name (widget_class, "calendar");
597 }
598
599+diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
600+index d10cd09..c3e68d3 100644
601 --- a/gtk/gtkcellrenderer.c
602 +++ b/gtk/gtkcellrenderer.c
603-@@ -443,8 +443,6 @@
604+@@ -443,8 +443,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
605
606 if (GtkCellRenderer_private_offset != 0)
607 g_type_class_adjust_private_offset (class, &GtkCellRenderer_private_offset);
608@@ -725,12 +943,10 @@
609 }
610
611 static void
612-@@ -1848,40 +1846,5 @@
613- state |= GTK_STATE_FLAG_SELECTED;
614-
615+@@ -1850,38 +1848,3 @@ gtk_cell_renderer_get_state (GtkCellRenderer *cell,
616 return state;
617--}
618--
619+ }
620+
621 -/**
622 - * gtk_cell_renderer_class_set_accessible_type:
623 - * @renderer_class: class to set the accessible type for
624@@ -764,11 +980,13 @@
625 - g_return_val_if_fail (GTK_IS_CELL_RENDERER (renderer), GTK_TYPE_RENDERER_CELL_ACCESSIBLE);
626 -
627 - return GTK_CELL_RENDERER_GET_CLASS (renderer)->priv->accessible_type;
628- }
629-
630+-}
631+-
632+diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
633+index e24f956..f4c9baf 100644
634 --- a/gtk/gtkcellrendererpixbuf.c
635 +++ b/gtk/gtkcellrendererpixbuf.c
636-@@ -282,10 +282,6 @@
637+@@ -282,10 +282,6 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
638 P_("The GIcon being displayed"),
639 G_TYPE_ICON,
640 GTK_PARAM_READWRITE));
641@@ -779,9 +997,11 @@
642 }
643
644 static void
645+diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
646+index 32eb155..aed7c6d 100644
647 --- a/gtk/gtkcellrenderertext.c
648 +++ b/gtk/gtkcellrenderertext.c
649-@@ -692,8 +692,6 @@
650+@@ -692,8 +692,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
651 g_signal_set_va_marshaller (text_cell_renderer_signals [EDITED],
652 G_OBJECT_CLASS_TYPE (object_class),
653 _gtk_marshal_VOID__STRING_STRINGv);
654@@ -790,9 +1010,11 @@
655 }
656
657 static void
658+diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
659+index ea5aebf..ca75f9d 100644
660 --- a/gtk/gtkcellrenderertoggle.c
661 +++ b/gtk/gtkcellrenderertoggle.c
662-@@ -196,8 +196,6 @@
663+@@ -196,8 +196,6 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
664 NULL,
665 G_TYPE_NONE, 1,
666 G_TYPE_STRING);
667@@ -801,9 +1023,11 @@
668 }
669
670 static void
671+diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
672+index a274524..2a89fb3 100644
673 --- a/gtk/gtkcheckbutton.c
674 +++ b/gtk/gtkcheckbutton.c
675-@@ -253,7 +253,6 @@
676+@@ -253,7 +253,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
677 INDICATOR_SPACING,
678 GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
679
680@@ -811,9 +1035,11 @@
681 gtk_widget_class_set_css_name (widget_class, "checkbutton");
682 }
683
684+diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
685+index b3b32d2..ef71fb5 100644
686 --- a/gtk/gtkcheckmenuitem.c
687 +++ b/gtk/gtkcheckmenuitem.c
688-@@ -271,7 +271,6 @@
689+@@ -271,7 +271,6 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
690 NULL,
691 G_TYPE_NONE, 0);
692
693@@ -821,9 +1047,11 @@
694 gtk_widget_class_set_css_name (widget_class, "menuitem");
695 }
696
697+diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
698+index 9fca31d..1aea899 100644
699 --- a/gtk/gtkcolorchooserwidget.c
700 +++ b/gtk/gtkcolorchooserwidget.c
701-@@ -344,7 +344,6 @@
702+@@ -344,7 +344,6 @@ add_palette (GtkColorChooserWidget *cc,
703 {
704 GtkWidget *grid;
705 GtkWidget *p;
706@@ -831,7 +1059,7 @@
707 gint line, pos;
708 gint i;
709 gint left, right;
710-@@ -373,11 +372,8 @@
711+@@ -373,11 +372,8 @@ add_palette (GtkColorChooserWidget *cc,
712 for (i = 0; i < n_colors; i++)
713 {
714 p = gtk_color_swatch_new ();
715@@ -843,7 +1071,7 @@
716 }
717 else
718 {
719-@@ -385,7 +381,6 @@
720+@@ -385,7 +381,6 @@ add_palette (GtkColorChooserWidget *cc,
721
722 name = accessible_color_name (&colors[i]);
723 text = g_strdup_printf (_("Color: %s"), name);
724@@ -851,7 +1079,7 @@
725 g_free (text);
726 g_free (name);
727 }
728-@@ -513,7 +508,6 @@
729+@@ -513,7 +508,6 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
730 GVariant *variant;
731 GVariantIter iter;
732 gboolean selected;
733@@ -859,7 +1087,7 @@
734 gchar *text, *name;
735
736 cc->priv = gtk_color_chooser_widget_get_instance_private (cc);
737-@@ -537,9 +531,6 @@
738+@@ -537,9 +531,6 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
739
740 cc->priv->button = button = gtk_color_swatch_new ();
741 gtk_widget_set_name (button, "add-color-button");
742@@ -869,7 +1097,7 @@
743 connect_button_signals (button, cc);
744 gtk_color_swatch_set_icon (GTK_COLOR_SWATCH (button), "list-add-symbolic");
745 gtk_color_swatch_set_selectable (GTK_COLOR_SWATCH (button), FALSE);
746-@@ -556,10 +547,8 @@
747+@@ -556,10 +547,8 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
748 p = gtk_color_swatch_new ();
749 gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), &color);
750 gtk_color_swatch_set_can_drop (GTK_COLOR_SWATCH (p), TRUE);
751@@ -880,9 +1108,11 @@
752 g_free (text);
753 g_free (name);
754 connect_custom_signals (p, cc);
755+diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
756+index aa964bb..8217b9a 100644
757 --- a/gtk/gtkcolorplane.c
758 +++ b/gtk/gtkcolorplane.c
759-@@ -392,8 +392,6 @@
760+@@ -392,8 +392,6 @@ plane_drag_gesture_end (GtkGestureDrag *gesture,
761 static void
762 gtk_color_plane_init (GtkColorPlane *plane)
763 {
764@@ -891,23 +1121,25 @@
765 plane->priv = gtk_color_plane_get_instance_private (plane);
766
767 gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
768-@@ -402,13 +400,6 @@
769- | GDK_BUTTON_PRESS_MASK
770+@@ -403,13 +401,6 @@ gtk_color_plane_init (GtkColorPlane *plane)
771 | GDK_BUTTON_RELEASE_MASK
772 | GDK_POINTER_MOTION_MASK);
773--
774+
775 - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (plane));
776 - if (GTK_IS_ACCESSIBLE (atk_obj))
777 - {
778 - atk_object_set_name (atk_obj, _("Color Plane"));
779 - atk_object_set_role (atk_obj, ATK_ROLE_COLOR_CHOOSER);
780 - }
781-
782+-
783 plane->priv->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
784 g_signal_connect (plane->priv->drag_gesture, "drag-begin",
785+ G_CALLBACK (plane_drag_gesture_begin), plane);
786+diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
787+index be1123d..47fad0d 100644
788 --- a/gtk/gtkcolorscale.c
789 +++ b/gtk/gtkcolorscale.c
790-@@ -200,19 +200,7 @@
791+@@ -200,19 +200,7 @@ static void
792 scale_set_type (GtkColorScale *scale,
793 GtkColorScaleType type)
794 {
795@@ -927,9 +1159,11 @@
796 }
797
798 static void
799+diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
800+index 106a19b..a5e9bb7 100644
801 --- a/gtk/gtkcolorswatch.c
802 +++ b/gtk/gtkcolorswatch.c
803-@@ -725,7 +725,6 @@
804+@@ -725,7 +725,6 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
805 g_param_spec_boolean ("has-menu", P_("Has Menu"), P_("Whether the swatch should offer customization"),
806 TRUE, GTK_PARAM_READWRITE));
807
808@@ -937,9 +1171,11 @@
809 gtk_widget_class_set_css_name (widget_class, "colorswatch");
810 }
811
812+diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
813+index ef4996c..8c93248 100644
814 --- a/gtk/gtkcombobox.c
815 +++ b/gtk/gtkcombobox.c
816-@@ -1255,7 +1255,6 @@
817+@@ -1255,7 +1255,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
818 gtk_widget_class_bind_template_child_internal_private (widget_class, GtkComboBox, arrow);
819 gtk_widget_class_bind_template_callback (widget_class, gtk_combo_box_button_toggled);
820
821@@ -947,11 +1183,10 @@
822 gtk_widget_class_set_css_name (widget_class, "combobox");
823 }
824
825-@@ -4639,35 +4638,6 @@
826- return combo_box->priv->popup_fixed_width;
827+@@ -4640,35 +4639,6 @@ gtk_combo_box_get_popup_fixed_width (GtkComboBox *combo_box)
828 }
829
830--
831+
832 -/**
833 - * gtk_combo_box_get_popup_accessible:
834 - * @combo_box: a #GtkComboBox
835@@ -980,12 +1215,15 @@
836 -
837 - return NULL;
838 -}
839-
840+-
841 /**
842 * gtk_combo_box_get_row_separator_func: (skip)
843+ * @combo_box: a #GtkComboBox
844+diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
845+index c886983..6835e9f 100644
846 --- a/gtk/gtkcombobox.h
847 +++ b/gtk/gtkcombobox.h
848-@@ -181,8 +181,6 @@
849+@@ -181,8 +181,6 @@ void gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
850 GdkDevice *device);
851 GDK_AVAILABLE_IN_ALL
852 void gtk_combo_box_popdown (GtkComboBox *combo_box);
853@@ -994,9 +1232,11 @@
854
855 GDK_AVAILABLE_IN_ALL
856 gint gtk_combo_box_get_id_column (GtkComboBox *combo_box);
857+diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
858+index 435a233..c69f265 100644
859 --- a/gtk/gtkcontainer.c
860 +++ b/gtk/gtkcontainer.c
861-@@ -591,8 +591,6 @@
862+@@ -591,8 +591,6 @@ gtk_container_class_init (GtkContainerClass *class)
863
864 if (GtkContainer_private_offset != 0)
865 g_type_class_adjust_private_offset (class, &GtkContainer_private_offset);
866@@ -1005,7 +1245,7 @@
867 }
868
869 static void
870-@@ -1875,8 +1873,6 @@
871+@@ -1875,8 +1873,6 @@ gtk_container_add (GtkContainer *container,
872 }
873
874 g_signal_emit (container, container_signals[ADD], 0, widget);
875@@ -1014,18 +1254,20 @@
876 }
877
878 /**
879-@@ -1905,8 +1901,6 @@
880- g_object_ref (widget);
881+@@ -1906,8 +1902,6 @@ gtk_container_remove (GtkContainer *container,
882
883 g_signal_emit (container, container_signals[REMOVE], 0, widget);
884--
885-- _gtk_container_accessible_remove (GTK_WIDGET (container), widget);
886
887+- _gtk_container_accessible_remove (GTK_WIDGET (container), widget);
888+-
889 g_object_unref (widget);
890 g_object_unref (container);
891+ }
892+diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
893+index 0e58ac4..dd87df4 100644
894 --- a/gtk/gtkdialog.c
895 +++ b/gtk/gtkdialog.c
896-@@ -533,8 +533,6 @@
897+@@ -533,8 +533,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
898 widget_class->map = gtk_dialog_map;
899 widget_class->style_updated = gtk_dialog_style_updated;
900
901@@ -1034,9 +1276,11 @@
902 class->close = gtk_dialog_close;
903
904 /**
905+diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
906+index 261bf34..7a5b6e3 100644
907 --- a/gtk/gtkdrawingarea.c
908 +++ b/gtk/gtkdrawingarea.c
909-@@ -135,8 +135,6 @@
910+@@ -135,8 +135,6 @@ gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
911 widget_class->realize = gtk_drawing_area_realize;
912 widget_class->size_allocate = gtk_drawing_area_size_allocate;
913 widget_class->style_updated = gtk_drawing_area_style_updated;
914@@ -1045,9 +1289,11 @@
915 }
916
917 static void
918+diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
919+index 4078855..7dd9f1a 100644
920 --- a/gtk/gtkentry.c
921 +++ b/gtk/gtkentry.c
922-@@ -2125,7 +2125,6 @@
923+@@ -2125,7 +2125,6 @@ gtk_entry_class_init (GtkEntryClass *class)
924 gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_CONTROL_MASK,
925 "insert-emoji", 0);
926
927@@ -1055,9 +1301,11 @@
928 gtk_widget_class_set_css_name (widget_class, "entry");
929 }
930
931+diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
932+index ea159fe..0c04e53 100644
933 --- a/gtk/gtkentrycompletion.c
934 +++ b/gtk/gtkentrycompletion.c
935-@@ -2634,30 +2634,12 @@
936+@@ -2634,30 +2634,12 @@ static void
937 set_accessible_relation (GtkWidget *window,
938 GtkWidget *entry)
939 {
940@@ -1088,9 +1336,11 @@
941 }
942
943 static void
944+diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
945+index 8cfbdb3..78f30d9 100644
946 --- a/gtk/gtkexpander.c
947 +++ b/gtk/gtkexpander.c
948-@@ -427,7 +427,6 @@
949+@@ -427,7 +427,6 @@ gtk_expander_class_init (GtkExpanderClass *klass)
950 NULL,
951 G_TYPE_NONE, 0);
952
953@@ -1098,9 +1348,11 @@
954 gtk_widget_class_set_css_name (widget_class, "expander");
955 }
956
957+diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
958+index db1d8f6..e577f8e 100644
959 --- a/gtk/gtkfilechooserdialog.c
960 +++ b/gtk/gtkfilechooserdialog.c
961-@@ -265,8 +265,6 @@
962+@@ -265,8 +265,6 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class)
963 widget_class->unmap = gtk_file_chooser_dialog_unmap;
964 widget_class->size_allocate = gtk_file_chooser_dialog_size_allocate;
965
966@@ -1109,9 +1361,11 @@
967 _gtk_file_chooser_install_properties (gobject_class);
968
969 /* Bind class to template
970+diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
971+index ab531f7..46acc87 100644
972 --- a/gtk/gtkfilechooserwidget.c
973 +++ b/gtk/gtkfilechooserwidget.c
974-@@ -8753,7 +8753,6 @@
975+@@ -8758,7 +8758,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
976 gtk_widget_class_bind_template_callback (widget_class, rename_file_rename_clicked);
977 gtk_widget_class_bind_template_callback (widget_class, rename_file_end);
978
979@@ -1119,7 +1373,7 @@
980 gtk_widget_class_set_css_name (widget_class, "filechooser");
981 }
982
983-@@ -8762,7 +8761,6 @@
984+@@ -8767,7 +8766,6 @@ post_process_ui (GtkFileChooserWidget *impl)
985 {
986 GtkTreeSelection *selection;
987 GtkCellRenderer *cell;
988@@ -1127,20 +1381,22 @@
989 GList *cells;
990 GFile *file;
991
992-@@ -8818,10 +8816,6 @@
993- * that priv->icon_size be already setup.
994+@@ -8824,10 +8822,6 @@ post_process_ui (GtkFileChooserWidget *impl)
995 */
996 set_icon_cell_renderer_fixed_size (impl);
997--
998+
999 - atk_obj = gtk_widget_get_accessible (impl->priv->browse_new_folder_button);
1000 - if (GTK_IS_ACCESSIBLE (atk_obj))
1001 - atk_object_set_name (atk_obj, _("Create Folder"));
1002-
1003+-
1004 gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button);
1005 gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button);
1006+ gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view);
1007+diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
1008+index cd7bd83..9abf11f 100644
1009 --- a/gtk/gtkflowbox.c
1010 +++ b/gtk/gtkflowbox.c
1011-@@ -635,7 +635,6 @@
1012+@@ -635,7 +635,6 @@ gtk_flow_box_child_class_init (GtkFlowBoxChildClass *class)
1013 G_TYPE_NONE, 0);
1014 widget_class->activate_signal = child_signals[CHILD_ACTIVATE];
1015
1016@@ -1148,7 +1404,7 @@
1017 gtk_widget_class_set_css_name (widget_class, "flowboxchild");
1018 }
1019
1020-@@ -1025,7 +1024,6 @@
1021+@@ -1025,7 +1024,6 @@ gtk_flow_box_update_cursor (GtkFlowBox *box,
1022 BOX_PRIV (box)->cursor_child = child;
1023 gtk_widget_grab_focus (GTK_WIDGET (child));
1024 gtk_widget_queue_draw (GTK_WIDGET (child));
1025@@ -1156,7 +1412,7 @@
1026 }
1027
1028 static void
1029-@@ -3645,7 +3643,6 @@
1030+@@ -3645,7 +3643,6 @@ gtk_flow_box_move_cursor (GtkFlowBox *box,
1031 static void
1032 gtk_flow_box_selected_children_changed (GtkFlowBox *box)
1033 {
1034@@ -1164,7 +1420,7 @@
1035 }
1036
1037 /* GObject implementation {{{2 */
1038-@@ -4100,7 +4097,6 @@
1039+@@ -4100,7 +4097,6 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
1040 gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
1041 "unselect-all", 0);
1042
1043@@ -1172,6 +1428,8 @@
1044 gtk_widget_class_set_css_name (widget_class, "flowbox");
1045 }
1046
1047+diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
1048+index 723412f..9b2b349 100644
1049 --- a/gtk/gtkfontchooserdialog.c
1050 +++ b/gtk/gtkfontchooserdialog.c
1051 @@ -22,8 +22,6 @@
1052@@ -1183,6 +1441,8 @@
1053 #include "gtkfontchooserdialog.h"
1054 #include "gtkfontchooser.h"
1055 #include "gtkfontchooserwidget.h"
1056+diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
1057+index 50f3b2f..a610e3e 100644
1058 --- a/gtk/gtkfontchooserwidget.c
1059 +++ b/gtk/gtkfontchooserwidget.c
1060 @@ -21,8 +21,6 @@
1061@@ -1194,9 +1454,11 @@
1062 #include "gtkfontchooserwidget.h"
1063 #include "gtkfontchooserwidgetprivate.h"
1064
1065+diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
1066+index 8ae7054..7ddcd45 100644
1067 --- a/gtk/gtkframe.c
1068 +++ b/gtk/gtkframe.c
1069-@@ -282,7 +282,6 @@
1070+@@ -282,7 +282,6 @@ gtk_frame_class_init (GtkFrameClass *class)
1071
1072 class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
1073
1074@@ -1204,9 +1466,11 @@
1075 gtk_widget_class_set_css_name (widget_class, "frame");
1076 }
1077
1078+diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
1079+index 802303e..145e5ad 100644
1080 --- a/gtk/gtkglarea.c
1081 +++ b/gtk/gtkglarea.c
1082-@@ -766,8 +766,6 @@
1083+@@ -766,8 +766,6 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass)
1084 widget_class->size_allocate = gtk_gl_area_size_allocate;
1085 widget_class->draw = gtk_gl_area_draw;
1086
1087@@ -1215,9 +1479,11 @@
1088 /**
1089 * GtkGLArea:context:
1090 *
1091+diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
1092+index 0ef94e3..5c32fc6 100644
1093 --- a/gtk/gtkheaderbar.c
1094 +++ b/gtk/gtkheaderbar.c
1095-@@ -351,7 +351,6 @@
1096+@@ -351,7 +351,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1097 {
1098 GtkWidget *button = NULL;
1099 GtkWidget *image = NULL;
1100@@ -1225,7 +1491,7 @@
1101
1102 if (strcmp (t[j], "icon") == 0 &&
1103 is_sovereign_window)
1104-@@ -386,10 +385,6 @@
1105+@@ -386,10 +385,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1106 gtk_widget_set_can_focus (button, FALSE);
1107 gtk_widget_show_all (button);
1108
1109@@ -1236,7 +1502,7 @@
1110 priv->titlebar_icon = image;
1111 if (!_gtk_header_bar_update_window_icon (bar, window))
1112 gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon),
1113-@@ -409,10 +404,6 @@
1114+@@ -409,10 +404,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1115 gtk_widget_show_all (button);
1116 g_signal_connect_swapped (button, "clicked",
1117 G_CALLBACK (gtk_window_iconify), window);
1118@@ -1247,7 +1513,7 @@
1119 }
1120 else if (strcmp (t[j], "maximize") == 0 &&
1121 gtk_window_get_resizable (window) &&
1122-@@ -433,10 +424,6 @@
1123+@@ -433,10 +424,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1124 gtk_widget_show_all (button);
1125 g_signal_connect_swapped (button, "clicked",
1126 G_CALLBACK (_gtk_window_toggle_maximized), window);
1127@@ -1258,7 +1524,7 @@
1128 }
1129 else if (strcmp (t[j], "close") == 0 &&
1130 gtk_window_get_deletable (window))
1131-@@ -452,10 +439,6 @@
1132+@@ -452,10 +439,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1133 gtk_widget_show_all (button);
1134 g_signal_connect_swapped (button, "clicked",
1135 G_CALLBACK (gtk_window_close), window);
1136@@ -1269,7 +1535,7 @@
1137 }
1138
1139 if (button)
1140-@@ -2118,8 +2101,6 @@
1141+@@ -2118,8 +2101,6 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class)
1142
1143 g_object_class_install_properties (object_class, LAST_PROP, header_bar_props);
1144
1145@@ -1278,9 +1544,11 @@
1146 gtk_widget_class_set_css_name (widget_class, "headerbar");
1147 }
1148
1149+diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
1150+index 735695e..2fdb814 100644
1151 --- a/gtk/gtkiconview.c
1152 +++ b/gtk/gtkiconview.c
1153-@@ -965,7 +965,6 @@
1154+@@ -965,7 +965,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
1155 gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
1156 GTK_MOVEMENT_VISUAL_POSITIONS, -1);
1157
1158@@ -1288,7 +1556,7 @@
1159 gtk_widget_class_set_css_name (widget_class, "iconview");
1160 }
1161
1162-@@ -2125,19 +2124,6 @@
1163+@@ -2125,19 +2124,6 @@ static void
1164 gtk_icon_view_item_selected_changed (GtkIconView *icon_view,
1165 GtkIconViewItem *item)
1166 {
1167@@ -1308,7 +1576,7 @@
1168 }
1169
1170 static void
1171-@@ -2939,8 +2925,6 @@
1172+@@ -2939,8 +2925,6 @@ gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
1173
1174 if (icon_view->priv->doing_rubberband)
1175 gtk_icon_view_update_rubberband (GTK_WIDGET (icon_view));
1176@@ -1317,7 +1585,7 @@
1177 }
1178 }
1179
1180-@@ -3238,10 +3222,6 @@
1181+@@ -3238,10 +3222,6 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1182 GtkIconViewItem *item,
1183 GtkCellRenderer *cursor_cell)
1184 {
1185@@ -1328,7 +1596,7 @@
1186 /* When hitting this path from keynav, the focus cell is
1187 * already set, we dont need to notify the atk object
1188 * but we still need to queue the draw here (in the case
1189-@@ -3253,17 +3233,10 @@
1190+@@ -3253,17 +3233,10 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1191 (cursor_cell == NULL || cursor_cell == gtk_cell_area_get_focus_cell (icon_view->priv->cell_area)))
1192 return;
1193
1194@@ -1346,11 +1614,10 @@
1195 icon_view->priv->cursor_item = item;
1196
1197 if (cursor_cell)
1198-@@ -3273,18 +3246,6 @@
1199- /* Make sure there is a cell in focus initially */
1200+@@ -3274,18 +3247,6 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1201 if (!gtk_cell_area_get_focus_cell (icon_view->priv->cell_area))
1202 gtk_cell_area_focus (icon_view->priv->cell_area, GTK_DIR_TAB_FORWARD);
1203-- }
1204+ }
1205 -
1206 - /* Notify that accessible focus object has changed */
1207 - item_obj = atk_object_ref_accessible_child (obj, item->index);
1208@@ -1362,12 +1629,15 @@
1209 - G_GNUC_END_IGNORE_DEPRECATIONS;
1210 - atk_object_notify_state_change (item_obj, ATK_STATE_FOCUSED, TRUE);
1211 - g_object_unref (item_obj);
1212- }
1213+- }
1214 }
1215
1216+
1217+diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
1218+index 5d6e715..df60ede 100644
1219 --- a/gtk/gtkimage.c
1220 +++ b/gtk/gtkimage.c
1221-@@ -402,7 +402,6 @@
1222+@@ -402,7 +402,6 @@ gtk_image_class_init (GtkImageClass *class)
1223
1224 g_object_class_install_properties (gobject_class, NUM_PROPERTIES, image_props);
1225
1226@@ -1375,9 +1645,11 @@
1227 gtk_widget_class_set_css_name (widget_class, "image");
1228 }
1229
1230+diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
1231+index 8eb89ff..6ee5bc1 100644
1232 --- a/gtk/gtkinfobar.c
1233 +++ b/gtk/gtkinfobar.c
1234-@@ -1276,7 +1276,6 @@
1235+@@ -1276,7 +1276,6 @@ gtk_info_bar_set_message_type (GtkInfoBar *info_bar,
1236 if (priv->message_type != message_type)
1237 {
1238 GtkStyleContext *context;
1239@@ -1385,11 +1657,10 @@
1240 const char *type_class[] = {
1241 GTK_STYLE_CLASS_INFO,
1242 GTK_STYLE_CLASS_WARNING,
1243-@@ -1293,43 +1292,6 @@
1244- priv->message_type = message_type;
1245+@@ -1294,43 +1293,6 @@ gtk_info_bar_set_message_type (GtkInfoBar *info_bar,
1246
1247 gtk_widget_queue_draw (GTK_WIDGET (info_bar));
1248--
1249+
1250 - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (info_bar));
1251 - if (GTK_IS_ACCESSIBLE (atk_obj))
1252 - {
1253@@ -1426,12 +1697,15 @@
1254 - if (name)
1255 - atk_object_set_name (atk_obj, name);
1256 - }
1257-
1258+-
1259 if (type_class[priv->message_type])
1260 gtk_style_context_add_class (context, type_class[priv->message_type]);
1261+
1262+diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
1263+index 8ba764c..b011d7b 100644
1264 --- a/gtk/gtklabel.c
1265 +++ b/gtk/gtklabel.c
1266-@@ -1194,8 +1194,6 @@
1267+@@ -1194,8 +1194,6 @@ gtk_label_class_init (GtkLabelClass *class)
1268 gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
1269 "activate-current-link", 0);
1270
1271@@ -1440,7 +1714,7 @@
1272 gtk_widget_class_set_css_name (widget_class, "label");
1273
1274 quark_shortcuts_connected = g_quark_from_static_string ("gtk-label-shortcuts-connected");
1275-@@ -2146,12 +2144,9 @@
1276+@@ -2146,12 +2144,9 @@ gtk_label_set_text_internal (GtkLabel *label,
1277 return;
1278 }
1279
1280@@ -1453,7 +1727,7 @@
1281 gtk_label_select_region_index (label, 0, 0);
1282 }
1283
1284-@@ -2680,7 +2675,6 @@
1285+@@ -2680,7 +2675,6 @@ gtk_label_set_markup_internal (GtkLabel *label,
1286 {
1287 gtk_label_ensure_select_info (label);
1288 priv->select_info->links = g_list_reverse (links);
1289@@ -1461,7 +1735,7 @@
1290 gtk_label_ensure_has_tooltip (label);
1291 }
1292
1293-@@ -4818,7 +4812,6 @@
1294+@@ -4818,7 +4812,6 @@ gtk_label_grab_focus (GtkWidget *widget)
1295 {
1296 priv->select_info->selection_anchor = link->start;
1297 priv->select_info->selection_end = link->start;
1298@@ -1469,7 +1743,7 @@
1299 break;
1300 }
1301 }
1302-@@ -4851,7 +4844,6 @@
1303+@@ -4851,7 +4844,6 @@ gtk_label_focus (GtkWidget *widget,
1304 {
1305 info->selection_anchor = focus_link->start;
1306 info->selection_end = focus_link->start;
1307@@ -1477,7 +1751,7 @@
1308 }
1309 }
1310 }
1311-@@ -4882,7 +4874,6 @@
1312+@@ -4882,7 +4874,6 @@ gtk_label_focus (GtkWidget *widget,
1313 if (!range_is_in_ellipsis (label, link->start, link->end))
1314 {
1315 gtk_label_select_region_index (label, link->start, link->start);
1316@@ -1485,7 +1759,7 @@
1317 return TRUE;
1318 }
1319 }
1320-@@ -4897,7 +4888,6 @@
1321+@@ -4897,7 +4888,6 @@ gtk_label_focus (GtkWidget *widget,
1322 if (!range_is_in_ellipsis (label, link->start, link->end))
1323 {
1324 gtk_label_select_region_index (label, link->start, link->start);
1325@@ -1493,7 +1767,7 @@
1326 return TRUE;
1327 }
1328 }
1329-@@ -4951,7 +4941,6 @@
1330+@@ -4951,7 +4941,6 @@ gtk_label_focus (GtkWidget *widget,
1331 focus_link = l->data;
1332 info->selection_anchor = focus_link->start;
1333 info->selection_end = focus_link->start;
1334@@ -1501,7 +1775,7 @@
1335 gtk_widget_queue_draw (widget);
1336
1337 return TRUE;
1338-@@ -6732,7 +6721,6 @@
1339+@@ -6733,7 +6722,6 @@ gtk_label_clear_links (GtkLabel *label)
1340 priv->select_info->links = NULL;
1341 priv->select_info->active_link = NULL;
1342
1343@@ -1509,9 +1783,11 @@
1344 }
1345
1346 static gboolean
1347+diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
1348+index 6e3ac12..296eb28 100644
1349 --- a/gtk/gtklevelbar.c
1350 +++ b/gtk/gtklevelbar.c
1351-@@ -1136,7 +1136,6 @@
1352+@@ -1136,7 +1136,6 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
1353
1354 g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
1355
1356@@ -1519,9 +1795,11 @@
1357 gtk_widget_class_set_css_name (wclass, "levelbar");
1358 }
1359
1360+diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
1361+index 103348a..3476b79 100644
1362 --- a/gtk/gtklinkbutton.c
1363 +++ b/gtk/gtklinkbutton.c
1364-@@ -209,7 +209,6 @@
1365+@@ -209,7 +209,6 @@ gtk_link_button_class_init (GtkLinkButtonClass *klass)
1366 _gtk_marshal_BOOLEAN__VOID,
1367 G_TYPE_BOOLEAN, 0);
1368
1369@@ -1529,9 +1807,11 @@
1370 gtk_widget_class_set_css_name (widget_class, "button");
1371 }
1372
1373+diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
1374+index efc3434..11b0b98 100644
1375 --- a/gtk/gtklistbox.c
1376 +++ b/gtk/gtklistbox.c
1377-@@ -447,8 +447,6 @@
1378+@@ -447,8 +447,6 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
1379 GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
1380 GtkBindingSet *binding_set;
1381
1382@@ -1540,7 +1820,7 @@
1383 object_class->get_property = gtk_list_box_get_property;
1384 object_class->set_property = gtk_list_box_set_property;
1385 object_class->finalize = gtk_list_box_finalize;
1386-@@ -903,7 +901,6 @@
1387+@@ -903,7 +901,6 @@ gtk_list_box_unselect_all (GtkListBox *box)
1388 static void
1389 gtk_list_box_selected_rows_changed (GtkListBox *box)
1390 {
1391@@ -1548,7 +1828,7 @@
1392 }
1393
1394 /**
1395-@@ -1559,7 +1556,6 @@
1396+@@ -1559,7 +1556,6 @@ gtk_list_box_update_cursor (GtkListBox *box,
1397 if (grab_focus)
1398 gtk_widget_grab_focus (GTK_WIDGET (row));
1399 gtk_widget_queue_draw (GTK_WIDGET (row));
1400@@ -1556,18 +1836,20 @@
1401 }
1402
1403 static GtkListBox *
1404-@@ -3865,8 +3861,6 @@
1405- {
1406+@@ -3866,8 +3862,6 @@ gtk_list_box_row_class_init (GtkListBoxRowClass *klass)
1407 GObjectClass *object_class = G_OBJECT_CLASS (klass);
1408 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
1409--
1410-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ROW_ACCESSIBLE);
1411
1412+- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ROW_ACCESSIBLE);
1413+-
1414 object_class->get_property = gtk_list_box_row_get_property;
1415 object_class->set_property = gtk_list_box_row_set_property;
1416+ object_class->finalize = gtk_list_box_row_finalize;
1417+diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
1418+index 6750f6e..4086e67 100644
1419 --- a/gtk/gtklockbutton.c
1420 +++ b/gtk/gtklockbutton.c
1421-@@ -189,12 +189,10 @@
1422+@@ -189,12 +189,10 @@ gtk_lock_button_set_property (GObject *object,
1423
1424 case PROP_TEXT_LOCK:
1425 gtk_label_set_text (GTK_LABEL (priv->label_lock), g_value_get_string (value));
1426@@ -1580,7 +1862,7 @@
1427 break;
1428
1429 case PROP_TOOLTIP_LOCK:
1430-@@ -322,7 +320,6 @@
1431+@@ -322,7 +320,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
1432 gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, label_unlock);
1433 gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, stack);
1434
1435@@ -1588,7 +1870,7 @@
1436 gtk_widget_class_set_css_name (widget_class, "button");
1437 }
1438
1439-@@ -387,7 +384,6 @@
1440+@@ -387,7 +384,6 @@ update_state (GtkLockButton *button)
1441 gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon, GTK_ICON_SIZE_MENU);
1442 gtk_stack_set_visible_child (GTK_STACK (priv->stack),
1443 allowed ? priv->label_lock : priv->label_unlock);
1444@@ -1596,6 +1878,8 @@
1445 gtk_widget_set_tooltip_markup (GTK_WIDGET (button), tooltip);
1446 gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive);
1447 gtk_widget_set_visible (GTK_WIDGET (button), visible);
1448+diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
1449+index ae64e18..d82fbf3 100644
1450 --- a/gtk/gtkmain.c
1451 +++ b/gtk/gtkmain.c
1452 @@ -131,8 +131,6 @@
1453@@ -1607,7 +1891,7 @@
1454 /* Private type definitions
1455 */
1456 typedef struct _GtkKeySnooperData GtkKeySnooperData;
1457-@@ -712,7 +710,6 @@
1458+@@ -712,7 +710,6 @@ gettext_initialization (void)
1459 static void
1460 default_display_notify_cb (GdkDisplayManager *dm)
1461 {
1462@@ -1615,11 +1899,10 @@
1463 debug_flags[0].display = gdk_display_get_default ();
1464 }
1465
1466-@@ -2434,18 +2431,6 @@
1467- {
1468+@@ -2435,18 +2432,6 @@ gtk_invoke_key_snoopers (GtkWidget *grab_widget,
1469 GSList *slist;
1470 gint return_val = FALSE;
1471--
1472+
1473 - return_val = _gtk_accessibility_key_snooper (grab_widget, (GdkEventKey *) event);
1474 -
1475 - slist = key_snoopers;
1476@@ -1631,12 +1914,15 @@
1477 - slist = slist->next;
1478 - return_val = (*data->func) (grab_widget, (GdkEventKey*) event, data->func_data);
1479 - }
1480-
1481+-
1482 return return_val;
1483 }
1484+
1485+diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
1486+index 18bef69..c039a03 100644
1487 --- a/gtk/gtkmenu.c
1488 +++ b/gtk/gtkmenu.c
1489-@@ -1090,7 +1090,6 @@
1490+@@ -1090,7 +1090,6 @@ gtk_menu_class_init (GtkMenuClass *class)
1491 GTK_TYPE_SCROLL_TYPE,
1492 GTK_SCROLL_PAGE_DOWN);
1493
1494@@ -1644,9 +1930,11 @@
1495 gtk_widget_class_set_css_name (widget_class, "menu");
1496 }
1497
1498+diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
1499+index fcf687b..ba80892 100644
1500 --- a/gtk/gtkmenubar.c
1501 +++ b/gtk/gtkmenubar.c
1502-@@ -275,7 +275,6 @@
1503+@@ -275,7 +275,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
1504 GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1505
1506 gtk_container_class_handle_border_width (container_class);
1507@@ -1654,9 +1942,11 @@
1508 gtk_widget_class_set_css_name (widget_class, "menubar");
1509 }
1510
1511+diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
1512+index 56b687f..2bd7956 100644
1513 --- a/gtk/gtkmenubutton.c
1514 +++ b/gtk/gtkmenubutton.c
1515-@@ -568,7 +568,6 @@
1516+@@ -568,7 +568,6 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
1517
1518 g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
1519
1520@@ -1664,9 +1954,11 @@
1521 gtk_widget_class_set_css_name (widget_class, "button");
1522 }
1523
1524+diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
1525+index 2fee8ee..f1d21c6 100644
1526 --- a/gtk/gtkmenuitem.c
1527 +++ b/gtk/gtkmenuitem.c
1528-@@ -919,7 +919,6 @@
1529+@@ -919,7 +919,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
1530 0, G_MAXINT, 12,
1531 GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1532
1533@@ -1674,9 +1966,11 @@
1534 gtk_widget_class_set_css_name (widget_class, "menuitem");
1535
1536 gtk_container_class_handle_border_width (container_class);
1537+diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
1538+index 515492c..5ea8925 100644
1539 --- a/gtk/gtkmenushell.c
1540 +++ b/gtk/gtkmenushell.c
1541-@@ -420,8 +420,6 @@
1542+@@ -420,8 +420,6 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
1543 P_("A boolean that determines whether the menu grabs the keyboard focus"),
1544 TRUE,
1545 GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
1546@@ -1685,9 +1979,11 @@
1547 }
1548
1549 static GType
1550+diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
1551+index e70c820..82d22ec 100644
1552 --- a/gtk/gtkmessagedialog.c
1553 +++ b/gtk/gtkmessagedialog.c
1554-@@ -163,8 +163,6 @@
1555+@@ -163,8 +163,6 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
1556
1557 widget_class->style_updated = gtk_message_dialog_style_updated;
1558
1559@@ -1696,7 +1992,7 @@
1560 gobject_class->constructed = gtk_message_dialog_constructed;
1561 gobject_class->set_property = gtk_message_dialog_set_property;
1562 gobject_class->get_property = gtk_message_dialog_get_property;
1563-@@ -372,7 +370,6 @@
1564+@@ -372,7 +370,6 @@ setup_type (GtkMessageDialog *dialog,
1565 {
1566 GtkMessageDialogPrivate *priv = dialog->priv;
1567 const gchar *name = NULL;
1568@@ -1704,24 +2000,26 @@
1569
1570 if (priv->message_type == type)
1571 return;
1572-@@ -403,14 +400,6 @@
1573- default:
1574- g_warning ("Unknown GtkMessageType %u", type);
1575+@@ -405,14 +402,6 @@ setup_type (GtkMessageDialog *dialog,
1576 break;
1577-- }
1578--
1579+ }
1580+
1581 - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
1582 - if (GTK_IS_ACCESSIBLE (atk_obj))
1583 - {
1584 - atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
1585 - if (name)
1586 - atk_object_set_name (atk_obj, name);
1587- }
1588-
1589+- }
1590+-
1591 g_object_notify (G_OBJECT (dialog), "message-type");
1592+ }
1593+
1594+diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
1595+index 4653cff..e0b5c12 100644
1596 --- a/gtk/gtkmodelbutton.c
1597 +++ b/gtk/gtkmodelbutton.c
1598-@@ -247,15 +247,6 @@
1599+@@ -247,15 +247,6 @@ gtk_model_button_update_state (GtkModelButton *button)
1600 gtk_css_gadget_set_state (button->gadget, state);
1601
1602 gtk_css_gadget_set_state (button->indicator_gadget, indicator_state);
1603@@ -1737,7 +2035,7 @@
1604 }
1605
1606 static void
1607-@@ -310,17 +301,13 @@
1608+@@ -310,17 +301,13 @@ gtk_model_button_direction_changed (GtkWidget *widget,
1609 static void
1610 update_node_name (GtkModelButton *button)
1611 {
1612@@ -1755,7 +2053,7 @@
1613 if (button->menu_name)
1614 {
1615 indicator_name = I_("arrow");
1616-@@ -334,13 +321,11 @@
1617+@@ -334,13 +321,11 @@ update_node_name (GtkModelButton *button)
1618 break;
1619
1620 case GTK_BUTTON_ROLE_CHECK:
1621@@ -1769,7 +2067,7 @@
1622 indicator_name = I_("radio");
1623 indicator_visible = TRUE;
1624 break;
1625-@@ -352,8 +337,6 @@
1626+@@ -352,8 +337,6 @@ update_node_name (GtkModelButton *button)
1627 if (button->iconic)
1628 indicator_visible = FALSE;
1629
1630@@ -1778,7 +2076,7 @@
1631 indicator_node = gtk_css_gadget_get_node (button->indicator_gadget);
1632 gtk_css_node_set_name (indicator_node, indicator_name);
1633 gtk_css_node_set_visible (indicator_node, indicator_visible);
1634-@@ -1099,18 +1082,6 @@
1635+@@ -1099,18 +1082,6 @@ gtk_model_button_finalize (GObject *object)
1636 G_OBJECT_CLASS (gtk_model_button_parent_class)->finalize (object);
1637 }
1638
1639@@ -1797,7 +2095,7 @@
1640 static void
1641 gtk_model_button_class_init (GtkModelButtonClass *class)
1642 {
1643-@@ -1132,7 +1103,6 @@
1644+@@ -1132,7 +1103,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
1645 widget_class->destroy = gtk_model_button_destroy;
1646 widget_class->state_flags_changed = gtk_model_button_state_flags_changed;
1647 widget_class->direction_changed = gtk_model_button_direction_changed;
1648@@ -1805,7 +2103,7 @@
1649
1650 button_class->clicked = gtk_model_button_clicked;
1651
1652-@@ -1276,7 +1246,6 @@
1653+@@ -1276,7 +1246,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
1654 G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
1655 g_object_class_install_properties (object_class, LAST_PROPERTY, properties);
1656
1657@@ -1813,9 +2111,11 @@
1658 gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "modelbutton");
1659 }
1660
1661+diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
1662+index 103f053..c0ac121 100644
1663 --- a/gtk/gtkmodelmenuitem.c
1664 +++ b/gtk/gtkmodelmenuitem.c
1665-@@ -94,35 +94,27 @@
1666+@@ -94,35 +94,27 @@ static void
1667 gtk_model_menu_item_set_action_role (GtkModelMenuItem *item,
1668 GtkMenuTrackerItemRole role)
1669 {
1670@@ -1851,7 +2151,7 @@
1671 g_object_notify (G_OBJECT (item), "action-role");
1672 }
1673
1674-@@ -499,8 +491,6 @@
1675+@@ -499,8 +491,6 @@ gtk_model_menu_item_class_init (GtkModelMenuItemClass *class)
1676 g_object_class_install_property (object_class, PROP_ACCEL,
1677 g_param_spec_string ("accel", "accel", "accel", NULL,
1678 G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
1679@@ -1860,9 +2160,11 @@
1680 }
1681
1682 GtkWidget *
1683+diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
1684+index f51570e..8a1c642 100644
1685 --- a/gtk/gtknotebook.c
1686 +++ b/gtk/gtknotebook.c
1687-@@ -1282,7 +1282,6 @@
1688+@@ -1282,7 +1282,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
1689
1690 gtk_container_class_handle_border_width (container_class);
1691
1692@@ -1870,9 +2172,11 @@
1693 gtk_widget_class_set_css_name (widget_class, "notebook");
1694 }
1695
1696+diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
1697+index 4d44a07..306ed97 100644
1698 --- a/gtk/gtkpaned.c
1699 +++ b/gtk/gtkpaned.c
1700-@@ -692,7 +692,6 @@
1701+@@ -692,7 +692,6 @@ gtk_paned_class_init (GtkPanedClass *class)
1702 add_move_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END);
1703 add_move_binding (binding_set, GDK_KEY_KP_End, 0, GTK_SCROLL_END);
1704
1705@@ -1880,9 +2184,11 @@
1706 gtk_widget_class_set_css_name (widget_class, "paned");
1707 }
1708
1709+diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
1710+index a76ad57..8745a6b 100644
1711 --- a/gtk/gtkpango.c
1712 +++ b/gtk/gtkpango.c
1713-@@ -233,301 +233,7 @@
1714+@@ -233,300 +233,6 @@ _gtk_pango_fill_layout (cairo_t *cr,
1715 cairo_move_to (cr, current_x, current_y);
1716 }
1717
1718@@ -1900,7 +2206,7 @@
1719 - return g_slist_prepend (attributes, at);
1720 -}
1721 -
1722- /*
1723+-/*
1724 - * _gtk_pango_get_default_attributes:
1725 - * @attributes: a #AtkAttributeSet to add the attributes to
1726 - * @layout: the #PangoLayout from which to get attributes
1727@@ -2180,11 +2486,10 @@
1728 - return attributes;
1729 -}
1730 -
1731--/*
1732+ /*
1733 * _gtk_pango_move_chars:
1734 * @layout: a #PangoLayout
1735- * @offset: a character offset in @layout
1736-@@ -793,7 +499,6 @@
1737+@@ -793,7 +499,6 @@ _gtk_pango_is_inside_sentence (PangoLayout *layout,
1738
1739 static void
1740 pango_layout_get_line_before (PangoLayout *layout,
1741@@ -2192,7 +2497,7 @@
1742 gint offset,
1743 gint *start_offset,
1744 gint *end_offset)
1745-@@ -818,23 +523,7 @@
1746+@@ -818,23 +523,7 @@ pango_layout_get_line_before (PangoLayout *layout,
1747 /* Found line for offset */
1748 if (prev_line)
1749 {
1750@@ -2216,7 +2521,7 @@
1751 else
1752 start_index = end_index = 0;
1753
1754-@@ -860,7 +549,6 @@
1755+@@ -860,7 +549,6 @@ pango_layout_get_line_before (PangoLayout *layout,
1756
1757 static void
1758 pango_layout_get_line_at (PangoLayout *layout,
1759@@ -2224,7 +2529,7 @@
1760 gint offset,
1761 gint *start_offset,
1762 gint *end_offset)
1763-@@ -882,21 +570,6 @@
1764+@@ -882,21 +570,6 @@ pango_layout_get_line_at (PangoLayout *layout,
1765
1766 if (index >= start_index && index <= end_index)
1767 {
1768@@ -2246,7 +2551,7 @@
1769 found = TRUE;
1770 break;
1771 }
1772-@@ -918,7 +591,6 @@
1773+@@ -918,7 +591,6 @@ pango_layout_get_line_at (PangoLayout *layout,
1774
1775 static void
1776 pango_layout_get_line_after (PangoLayout *layout,
1777@@ -2254,7 +2559,7 @@
1778 gint offset,
1779 gint *start_offset,
1780 gint *end_offset)
1781-@@ -944,23 +616,7 @@
1782+@@ -944,23 +616,7 @@ pango_layout_get_line_after (PangoLayout *layout,
1783 if (pango_layout_iter_next_line (iter))
1784 {
1785 line = pango_layout_iter_get_line (iter);
1786@@ -2278,7 +2583,7 @@
1787 else
1788 start_index = end_index;
1789
1790-@@ -986,23 +642,17 @@
1791+@@ -986,23 +642,17 @@ pango_layout_get_line_after (PangoLayout *layout,
1792 /*
1793 * _gtk_pango_get_text_before:
1794 * @layout: a #PangoLayout
1795@@ -2302,7 +2607,7 @@
1796 gint offset,
1797 gint *start_offset,
1798 gint *end_offset)
1799-@@ -1026,56 +676,6 @@
1800+@@ -1026,56 +676,6 @@ _gtk_pango_get_text_before (PangoLayout *layout,
1801 start = offset;
1802 end = start;
1803
1804@@ -2359,7 +2664,7 @@
1805 *start_offset = start;
1806 *end_offset = end;
1807
1808-@@ -1087,23 +687,17 @@
1809+@@ -1087,23 +687,17 @@ _gtk_pango_get_text_before (PangoLayout *layout,
1810 /*
1811 * _gtk_pango_get_text_after:
1812 * @layout: a #PangoLayout
1813@@ -2383,7 +2688,7 @@
1814 gint offset,
1815 gint *start_offset,
1816 gint *end_offset)
1817-@@ -1127,62 +721,6 @@
1818+@@ -1127,62 +721,6 @@ _gtk_pango_get_text_after (PangoLayout *layout,
1819 start = offset;
1820 end = start;
1821
1822@@ -2446,7 +2751,7 @@
1823 *start_offset = start;
1824 *end_offset = end;
1825
1826-@@ -1194,23 +732,17 @@
1827+@@ -1194,23 +732,17 @@ _gtk_pango_get_text_after (PangoLayout *layout,
1828 /*
1829 * _gtk_pango_get_text_at:
1830 * @layout: a #PangoLayout
1831@@ -2470,11 +2775,10 @@
1832 gint offset,
1833 gint *start_offset,
1834 gint *end_offset)
1835-@@ -1233,54 +765,6 @@
1836-
1837+@@ -1234,54 +766,6 @@ _gtk_pango_get_text_at (PangoLayout *layout,
1838 start = offset;
1839 end = start;
1840--
1841+
1842 - switch (boundary_type)
1843 - {
1844 - case ATK_TEXT_BOUNDARY_CHAR:
1845@@ -2522,9 +2826,12 @@
1846 - pango_layout_get_line_at (layout, boundary_type, offset, &start, &end);
1847 - break;
1848 - }
1849-
1850+-
1851 *start_offset = start;
1852 *end_offset = end;
1853+
1854+diff --git a/gtk/gtkpango.h b/gtk/gtkpango.h
1855+index 388e364..b085159 100644
1856 --- a/gtk/gtkpango.h
1857 +++ b/gtk/gtkpango.h
1858 @@ -27,7 +27,6 @@
1859@@ -2535,7 +2842,7 @@
1860
1861 G_BEGIN_DECLS
1862
1863-@@ -35,15 +34,6 @@
1864+@@ -35,15 +34,6 @@ void _gtk_pango_fill_layout (cairo_t *cr,
1865 PangoLayout *layout);
1866
1867
1868@@ -2551,7 +2858,7 @@
1869 gint _gtk_pango_move_chars (PangoLayout *layout,
1870 gint offset,
1871 gint count);
1872-@@ -64,17 +54,14 @@
1873+@@ -64,17 +54,14 @@ gboolean _gtk_pango_is_inside_sentence (PangoLayout *layout,
1874
1875
1876 gchar *_gtk_pango_get_text_before (PangoLayout *layout,
1877@@ -2569,6 +2876,8 @@
1878 gint offset,
1879 gint *start_offset,
1880 gint *end_offset);
1881+diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
1882+index 60d70ad..fff37bc 100644
1883 --- a/gtk/gtkpathbar.c
1884 +++ b/gtk/gtkpathbar.c
1885 @@ -1550,7 +1550,6 @@ make_directory_button (GtkPathBar *path_bar,
1886@@ -2595,9 +2904,24 @@
1887 break;
1888 case HOME_BUTTON:
1889 case DESKTOP_BUTTON:
1890+diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
1891+index 6361b60..8eec0d4 100644
1892+--- a/gtk/gtkplug.c
1893++++ b/gtk/gtkplug.c
1894+@@ -178,8 +178,6 @@ gtk_plug_class_init (GtkPlugClass *class)
1895+ widget_class->unmap = gtk_plug_unmap;
1896+ widget_class->focus = gtk_plug_focus;
1897+
1898+- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
1899+-
1900+ container_class->check_resize = gtk_plug_check_resize;
1901+
1902+ window_class->set_focus = gtk_plug_set_focus;
1903+diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
1904+index b812e0e..d405358 100644
1905 --- a/gtk/gtkpopover.c
1906 +++ b/gtk/gtkpopover.c
1907-@@ -1835,7 +1835,6 @@
1908+@@ -1836,7 +1836,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
1909 G_TYPE_NONE, 0);
1910
1911 quark_widget_popovers = g_quark_from_static_string ("gtk-quark-widget-popovers");
1912@@ -2605,9 +2929,11 @@
1913 gtk_widget_class_set_css_name (widget_class, "popover");
1914 }
1915
1916+diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
1917+index 4cb8437..b6a8f9e 100644
1918 --- a/gtk/gtkprogressbar.c
1919 +++ b/gtk/gtkprogressbar.c
1920-@@ -427,7 +427,6 @@
1921+@@ -427,7 +427,6 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
1922 1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
1923 G_PARAM_READWRITE|G_PARAM_DEPRECATED));
1924
1925@@ -2615,9 +2941,11 @@
1926 gtk_widget_class_set_css_name (widget_class, "progressbar");
1927 }
1928
1929+diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
1930+index 9b7aafd..85c5ced 100644
1931 --- a/gtk/gtkradiobutton.c
1932 +++ b/gtk/gtkradiobutton.c
1933-@@ -216,7 +216,6 @@
1934+@@ -216,7 +216,6 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
1935 NULL,
1936 G_TYPE_NONE, 0);
1937
1938@@ -2625,9 +2953,11 @@
1939 gtk_widget_class_set_css_name (widget_class, "radiobutton");
1940 }
1941
1942+diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
1943+index 8e66f85..a2e0fc0 100644
1944 --- a/gtk/gtkradiomenuitem.c
1945 +++ b/gtk/gtkradiomenuitem.c
1946-@@ -407,8 +407,6 @@
1947+@@ -407,8 +407,6 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
1948
1949 widget_class->destroy = gtk_radio_menu_item_destroy;
1950
1951@@ -2636,9 +2966,11 @@
1952 menu_item_class->activate = gtk_radio_menu_item_activate;
1953
1954 /**
1955+diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
1956+index f53e084..7b3408f 100644
1957 --- a/gtk/gtkrange.c
1958 +++ b/gtk/gtkrange.c
1959-@@ -657,8 +657,6 @@
1960+@@ -657,8 +657,6 @@ gtk_range_class_init (GtkRangeClass *class)
1961 P_("Arrow scaling with regard to scroll button size"),
1962 0.0, 1.0, 0.5,
1963 GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1964@@ -2647,9 +2979,11 @@
1965 }
1966
1967 static void
1968+diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
1969+index bee30ee..6d97b3d 100644
1970 --- a/gtk/gtkscale.c
1971 +++ b/gtk/gtkscale.c
1972-@@ -944,7 +944,6 @@
1973+@@ -944,7 +944,6 @@ gtk_scale_class_init (GtkScaleClass *class)
1974 add_slider_binding (binding_set, GDK_KEY_KP_End, 0,
1975 GTK_SCROLL_END);
1976
1977@@ -2657,9 +2991,11 @@
1978 gtk_widget_class_set_css_name (widget_class, "scale");
1979 }
1980
1981+diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
1982+index 82829b1..5377159 100644
1983 --- a/gtk/gtkscalebutton.c
1984 +++ b/gtk/gtkscalebutton.c
1985-@@ -343,7 +343,6 @@
1986+@@ -343,7 +343,6 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
1987 gtk_widget_class_bind_template_callback (widget_class, cb_scale_value_changed);
1988 gtk_widget_class_bind_template_callback (widget_class, cb_popup_mapped);
1989
1990@@ -2667,9 +3003,11 @@
1991 gtk_widget_class_set_css_name (widget_class, "button");
1992 }
1993
1994+diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
1995+index ca21d75..f63b6fa 100644
1996 --- a/gtk/gtkscrollbar.c
1997 +++ b/gtk/gtkscrollbar.c
1998-@@ -145,7 +145,6 @@
1999+@@ -145,7 +145,6 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
2000 FALSE,
2001 GTK_PARAM_READABLE));
2002
2003@@ -2677,9 +3015,11 @@
2004 gtk_widget_class_set_css_name (widget_class, "scrollbar");
2005 }
2006
2007+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
2008+index f4c09d0..0675256 100644
2009 --- a/gtk/gtkscrolledwindow.c
2010 +++ b/gtk/gtkscrolledwindow.c
2011-@@ -896,7 +896,6 @@
2012+@@ -896,7 +896,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
2013 add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
2014 add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
2015
2016@@ -2687,9 +3027,11 @@
2017 gtk_widget_class_set_css_name (widget_class, "scrolledwindow");
2018 }
2019
2020+diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
2021+index a1243f3..4e3996e 100644
2022 --- a/gtk/gtksearchentry.c
2023 +++ b/gtk/gtksearchentry.c
2024-@@ -358,17 +358,11 @@
2025+@@ -358,18 +358,12 @@ gtk_search_entry_changed (GtkEditable *editable)
2026 static void
2027 gtk_search_entry_init (GtkSearchEntry *entry)
2028 {
2029@@ -2700,16 +3042,19 @@
2030 "primary-icon-activatable", FALSE,
2031 "primary-icon-sensitive", FALSE,
2032 NULL);
2033--
2034+
2035 - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (entry));
2036 - if (GTK_IS_ACCESSIBLE (atk_obj))
2037 - atk_object_set_name (atk_obj, _("Search"));
2038-
2039+-
2040 gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), "search");
2041 }
2042+
2043+diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
2044+index f76fb36..b9bee8e 100644
2045 --- a/gtk/gtkseparator.c
2046 +++ b/gtk/gtkseparator.c
2047-@@ -211,7 +211,6 @@
2048+@@ -211,7 +211,6 @@ gtk_separator_class_init (GtkSeparatorClass *class)
2049
2050 g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
2051
2052@@ -2717,9 +3062,11 @@
2053 gtk_widget_class_set_css_name (widget_class, "separator");
2054 }
2055
2056+diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
2057+index 1073deb..75d5ee9 100644
2058 --- a/gtk/gtkseparatormenuitem.c
2059 +++ b/gtk/gtkseparatormenuitem.c
2060-@@ -58,7 +58,6 @@
2061+@@ -58,7 +58,6 @@ gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class)
2062
2063 GTK_MENU_ITEM_CLASS (class)->get_label = gtk_separator_menu_item_get_label;
2064
2065@@ -2727,9 +3074,31 @@
2066 gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "separator");
2067 }
2068
2069+diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
2070+index ffdaf8b..18b3d55 100644
2071+--- a/gtk/gtksocket.c
2072++++ b/gtk/gtksocket.c
2073+@@ -271,7 +271,6 @@ gtk_socket_class_init (GtkSocketClass *class)
2074+ G_TYPE_BOOLEAN, 0);
2075+
2076+
2077+- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SOCKET_ACCESSIBLE);
2078+ }
2079+
2080+ static void
2081+@@ -1432,7 +1431,6 @@ _gtk_socket_accessible_embed (GtkWidget *socket, GdkWindow *window)
2082+ return;
2083+ }
2084+
2085+- gtk_socket_accessible_embed (GTK_SOCKET_ACCESSIBLE (gtk_widget_get_accessible (socket)), (gchar*) data);
2086+ XFree (data);
2087+
2088+ return;
2089+diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
2090+index 8e65d8a..b936763 100644
2091 --- a/gtk/gtkspinbutton.c
2092 +++ b/gtk/gtkspinbutton.c
2093-@@ -592,7 +592,6 @@
2094+@@ -592,7 +592,6 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
2095 add_spin_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
2096 add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
2097
2098@@ -2737,9 +3106,11 @@
2099 gtk_widget_class_set_css_name (widget_class, "spinbutton");
2100 }
2101
2102+diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
2103+index 06020b3..a45a073 100644
2104 --- a/gtk/gtkspinner.c
2105 +++ b/gtk/gtkspinner.c
2106-@@ -223,7 +223,6 @@
2107+@@ -223,7 +223,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
2108 FALSE,
2109 GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
2110
2111@@ -2747,9 +3118,11 @@
2112 gtk_widget_class_set_css_name (widget_class, "spinner");
2113 }
2114
2115+diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
2116+index 51a3a73..338b2f0 100644
2117 --- a/gtk/gtkstack.c
2118 +++ b/gtk/gtkstack.c
2119-@@ -559,7 +559,6 @@
2120+@@ -559,7 +559,6 @@ gtk_stack_class_init (GtkStackClass *klass)
2121
2122 gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, stack_child_props);
2123
2124@@ -2757,20 +3130,22 @@
2125 gtk_widget_class_set_css_name (widget_class, "stack");
2126 }
2127
2128-@@ -1118,10 +1117,6 @@
2129- gtk_widget_set_child_visible (priv->visible_child->widget, FALSE);
2130+@@ -1119,10 +1118,6 @@ set_visible_child (GtkStack *stack,
2131 }
2132 }
2133--
2134+
2135 - gtk_stack_accessible_update_visible_child (stack,
2136 - priv->visible_child ? priv->visible_child->widget : NULL,
2137 - child_info ? child_info->widget : NULL);
2138-
2139+-
2140 priv->visible_child = child_info;
2141
2142+ if (child_info)
2143+diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
2144+index 8d34f64..3eed895 100644
2145 --- a/gtk/gtkstatusbar.c
2146 +++ b/gtk/gtkstatusbar.c
2147-@@ -187,7 +187,6 @@
2148+@@ -187,7 +187,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
2149 gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, frame);
2150 gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, label);
2151
2152@@ -2778,9 +3153,11 @@
2153 gtk_widget_class_set_css_name (widget_class, "statusbar");
2154 }
2155
2156+diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
2157+index 11625d1..3a03046 100644
2158 --- a/gtk/gtkstylecontext.c
2159 +++ b/gtk/gtkstylecontext.c
2160-@@ -3079,63 +3079,6 @@
2161+@@ -3102,63 +3102,6 @@ _gtk_style_context_get_pango_attributes (GtkStyleContext *context)
2162 return gtk_css_style_get_pango_attributes (gtk_style_context_lookup_style (context));
2163 }
2164
2165@@ -2844,6 +3221,8 @@
2166 cairo_pattern_t *
2167 gtk_gradient_resolve_for_context (GtkGradient *gradient,
2168 GtkStyleContext *context)
2169+diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
2170+index 9f8551f..42693ba 100644
2171 --- a/gtk/gtkstylecontext.h
2172 +++ b/gtk/gtkstylecontext.h
2173 @@ -26,7 +26,6 @@
2174@@ -2854,9 +3233,11 @@
2175
2176 G_BEGIN_DECLS
2177
2178+diff --git a/gtk/gtkstylecontextprivate.h b/gtk/gtkstylecontextprivate.h
2179+index 421e526..f527267 100644
2180 --- a/gtk/gtkstylecontextprivate.h
2181 +++ b/gtk/gtkstylecontextprivate.h
2182-@@ -72,11 +72,6 @@
2183+@@ -72,11 +72,6 @@ void _gtk_style_context_get_icon_extents (GtkStyleContext
2184
2185 PangoAttrList *_gtk_style_context_get_pango_attributes (GtkStyleContext *context);
2186
2187@@ -2868,9 +3249,11 @@
2188 G_END_DECLS
2189
2190 #endif /* __GTK_STYLE_CONTEXT_PRIVATE_H__ */
2191+diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
2192+index 8a4aa72..a21ad59 100644
2193 --- a/gtk/gtkswitch.c
2194 +++ b/gtk/gtkswitch.c
2195-@@ -1008,9 +1008,6 @@
2196+@@ -1008,9 +1008,6 @@ gtk_switch_class_init (GtkSwitchClass *klass)
2197 g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name");
2198 g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target");
2199
2200@@ -2880,7 +3263,7 @@
2201 gtk_widget_class_set_css_name (widget_class, "switch");
2202 }
2203
2204-@@ -1120,7 +1117,6 @@
2205+@@ -1120,7 +1117,6 @@ gtk_switch_set_active (GtkSwitch *sw,
2206
2207 if (priv->is_active != is_active)
2208 {
2209@@ -2888,19 +3271,21 @@
2210 gboolean handled;
2211
2212 priv->is_active = is_active;
2213-@@ -1133,9 +1129,6 @@
2214- g_signal_emit (sw, signals[STATE_SET], 0, is_active, &handled);
2215+@@ -1134,9 +1130,6 @@ gtk_switch_set_active (GtkSwitch *sw,
2216
2217 g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]);
2218--
2219+
2220 - accessible = gtk_widget_get_accessible (GTK_WIDGET (sw));
2221 - atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, priv->is_active);
2222-
2223+-
2224 gtk_widget_queue_allocate (GTK_WIDGET (sw));
2225 }
2226+ }
2227+diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
2228+index f5f17f5..90208e2 100644
2229 --- a/gtk/gtktextbuffer.c
2230 +++ b/gtk/gtktextbuffer.c
2231-@@ -4478,7 +4478,6 @@
2232+@@ -4478,7 +4478,6 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
2233
2234 void
2235 _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
2236@@ -2908,7 +3293,7 @@
2237 GtkTextIter *position,
2238 GtkTextIter *start,
2239 GtkTextIter *end)
2240-@@ -4487,103 +4486,10 @@
2241+@@ -4487,103 +4486,10 @@ _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
2242
2243 *start = *position;
2244 *end = *start;
2245@@ -3012,7 +3397,7 @@
2246 GtkTextIter *position,
2247 GtkTextIter *start,
2248 GtkTextIter *end)
2249-@@ -4592,187 +4498,16 @@
2250+@@ -4592,187 +4498,16 @@ _gtk_text_buffer_get_text_at (GtkTextBuffer *buffer,
2251
2252 *start = *position;
2253 *end = *start;
2254@@ -3200,9 +3585,11 @@
2255 }
2256
2257 static GtkTextTag *
2258+diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h
2259+index 8d8363c..c163f0d 100644
2260 --- a/gtk/gtktextbufferprivate.h
2261 +++ b/gtk/gtktextbufferprivate.h
2262-@@ -35,17 +35,14 @@
2263+@@ -35,17 +35,14 @@ void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
2264 GtkTextTag *tag);
2265
2266 void _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
2267@@ -3220,9 +3607,11 @@
2268 GtkTextIter *position,
2269 GtkTextIter *start,
2270 GtkTextIter *end);
2271+diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
2272+index 394da40..2873283 100644
2273 --- a/gtk/gtktextview.c
2274 +++ b/gtk/gtktextview.c
2275-@@ -1706,7 +1706,6 @@
2276+@@ -1706,7 +1706,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
2277 "move-focus", 1,
2278 GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
2279
2280@@ -3230,7 +3619,7 @@
2281 gtk_widget_class_set_css_name (widget_class, "textview");
2282
2283 quark_text_selection_data = g_quark_from_static_string ("gtk-text-view-text-selection-data");
2284-@@ -2016,7 +2015,6 @@
2285+@@ -2016,7 +2015,6 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
2286 gtk_text_view_update_handles (text_view, GTK_TEXT_HANDLE_MODE_NONE);
2287 }
2288
2289@@ -3238,9 +3627,11 @@
2290 if (old_buffer)
2291 g_object_unref (old_buffer);
2292
2293+diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
2294+index f594d8c..17579db 100644
2295 --- a/gtk/gtktogglebutton.c
2296 +++ b/gtk/gtktogglebutton.c
2297-@@ -222,7 +222,6 @@
2298+@@ -222,7 +222,6 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
2299 NULL,
2300 G_TYPE_NONE, 0);
2301
2302@@ -3248,9 +3639,11 @@
2303 gtk_widget_class_set_css_name (widget_class, "button");
2304 }
2305
2306+diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
2307+index 79164f3..1b94c08 100644
2308 --- a/gtk/gtktoolbar.c
2309 +++ b/gtk/gtktoolbar.c
2310-@@ -413,8 +413,6 @@
2311+@@ -413,8 +413,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
2312 widget_class->style_updated = gtk_toolbar_style_updated;
2313 widget_class->focus = gtk_toolbar_focus;
2314
2315@@ -3259,9 +3652,11 @@
2316 /* need to override the base class function via override_class_handler,
2317 * because the signal slot is not available in GtkWidgetClass
2318 */
2319+diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
2320+index e56f28b..6a432ea 100644
2321 --- a/gtk/gtktoolbutton.c
2322 +++ b/gtk/gtktoolbutton.c
2323-@@ -1193,7 +1193,6 @@
2324+@@ -1193,7 +1193,6 @@ gtk_tool_button_set_label (GtkToolButton *button,
2325 {
2326 gchar *old_label;
2327 gchar *elided_label;
2328@@ -3269,7 +3664,7 @@
2329
2330 g_return_if_fail (GTK_IS_TOOL_BUTTON (button));
2331
2332-@@ -1205,8 +1204,6 @@
2333+@@ -1205,8 +1204,6 @@ gtk_tool_button_set_label (GtkToolButton *button,
2334 if (label)
2335 {
2336 elided_label = _gtk_toolbar_elide_underscores (label);
2337@@ -3278,9 +3673,11 @@
2338 g_free (elided_label);
2339 }
2340
2341+diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
2342+index a88a64f..9333232 100644
2343 --- a/gtk/gtktooltipwindow.c
2344 +++ b/gtk/gtktooltipwindow.c
2345-@@ -64,7 +64,6 @@
2346+@@ -64,7 +64,6 @@ gtk_tooltip_window_class_init (GtkTooltipWindowClass *klass)
2347 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
2348
2349 gtk_widget_class_set_css_name (widget_class, I_("tooltip"));
2350@@ -3288,9 +3685,11 @@
2351 gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtktooltipwindow.ui");
2352
2353 gtk_widget_class_bind_template_child (widget_class, GtkTooltipWindow, box);
2354+diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
2355+index 677a277..9b588f6 100644
2356 --- a/gtk/gtktreeselection.c
2357 +++ b/gtk/gtktreeselection.c
2358-@@ -1638,12 +1638,10 @@
2359+@@ -1638,12 +1638,10 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
2360 if (!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
2361 {
2362 GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SELECTED);
2363@@ -3303,9 +3702,11 @@
2364 }
2365
2366 _gtk_tree_view_queue_draw_node (priv->tree_view, tree, node, NULL);
2367+diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
2368+index b6a4290..63339e3 100644
2369 --- a/gtk/gtktreeview.c
2370 +++ b/gtk/gtktreeview.c
2371-@@ -1811,7 +1811,6 @@
2372+@@ -1811,7 +1811,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
2373
2374 gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
2375
2376@@ -3313,7 +3714,7 @@
2377 gtk_widget_class_set_css_name (widget_class, "treeview");
2378 }
2379
2380-@@ -9029,8 +9028,6 @@
2381+@@ -9029,8 +9028,6 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
2382 if (tree == NULL)
2383 goto done;
2384
2385@@ -3322,7 +3723,7 @@
2386 if (tree_view->priv->fixed_height_mode
2387 && tree_view->priv->fixed_height >= 0)
2388 {
2389-@@ -9159,8 +9156,6 @@
2390+@@ -9159,8 +9156,6 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
2391 tmpnode = _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
2392 }
2393
2394@@ -3331,7 +3732,7 @@
2395 done:
2396 if (height > 0)
2397 {
2398-@@ -9223,12 +9218,10 @@
2399+@@ -9223,12 +9218,10 @@ gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
2400 if (has_child)
2401 {
2402 GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
2403@@ -3344,7 +3745,7 @@
2404 }
2405
2406 if (has_child && tree_view->priv->is_list)
2407-@@ -9378,15 +9371,10 @@
2408+@@ -9378,15 +9371,10 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
2409 if (tree_view->priv->tree == tree)
2410 tree_view->priv->tree = NULL;
2411
2412@@ -3360,7 +3761,7 @@
2413 _gtk_rbtree_remove_node (tree, node);
2414 }
2415
2416-@@ -9460,8 +9448,6 @@
2417+@@ -9460,8 +9448,6 @@ gtk_tree_view_rows_reordered (GtkTreeModel *model,
2418
2419 _gtk_rbtree_reorder (tree, new_order, len);
2420
2421@@ -3369,7 +3770,7 @@
2422 gtk_widget_queue_draw (GTK_WIDGET (tree_view));
2423
2424 gtk_tree_view_dy_to_top_row (tree_view);
2425-@@ -10293,9 +10279,6 @@
2426+@@ -10293,9 +10279,6 @@ _gtk_tree_view_set_focus_column (GtkTreeView *tree_view,
2427
2428 tree_view->priv->focus_column = column;
2429
2430@@ -3379,7 +3780,7 @@
2431 }
2432
2433
2434-@@ -11593,7 +11576,6 @@
2435+@@ -11593,7 +11576,6 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
2436 {
2437 tree_view->priv->tree = _gtk_rbtree_new ();
2438 gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE);
2439@@ -3387,7 +3788,7 @@
2440 }
2441 gtk_tree_path_free (path);
2442
2443-@@ -12145,8 +12127,6 @@
2444+@@ -12145,8 +12127,6 @@ gtk_tree_view_remove_column (GtkTreeView *tree_view,
2445 gtk_widget_queue_resize (GTK_WIDGET (tree_view));
2446 }
2447
2448@@ -3396,7 +3797,7 @@
2449 g_object_unref (column);
2450 g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
2451
2452-@@ -12217,8 +12197,6 @@
2453+@@ -12217,8 +12197,6 @@ gtk_tree_view_insert_column (GtkTreeView *tree_view,
2454 gtk_widget_queue_resize (GTK_WIDGET (tree_view));
2455 }
2456
2457@@ -3405,7 +3806,7 @@
2458 g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
2459
2460 return tree_view->priv->n_columns;
2461-@@ -12436,8 +12414,6 @@
2462+@@ -12436,8 +12414,6 @@ gtk_tree_view_move_column_after (GtkTreeView *tree_view,
2463 gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), NULL);
2464 }
2465
2466@@ -3414,7 +3815,7 @@
2467 g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
2468 }
2469
2470-@@ -12910,11 +12886,6 @@
2471+@@ -12910,11 +12886,6 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
2472 gtk_tree_path_get_depth (path) + 1,
2473 open_all);
2474
2475@@ -3426,7 +3827,7 @@
2476 install_presize_handler (tree_view);
2477
2478 g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
2479-@@ -13061,11 +13032,6 @@
2480+@@ -13061,11 +13032,6 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
2481 /* Stop a pending double click */
2482 gtk_event_controller_reset (GTK_EVENT_CONTROLLER (tree_view->priv->multipress_gesture));
2483
2484@@ -3438,7 +3839,7 @@
2485 _gtk_rbtree_remove (node->children);
2486
2487 if (cursor_changed)
2488-@@ -13284,10 +13250,6 @@
2489+@@ -13284,10 +13250,6 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
2490 {
2491 if (!(flags & CURSOR_INVALID) && tree_view->priv->cursor_node)
2492 {
2493@@ -3449,7 +3850,7 @@
2494 _gtk_tree_view_queue_draw_node (tree_view,
2495 tree_view->priv->cursor_tree,
2496 tree_view->priv->cursor_node,
2497-@@ -13352,10 +13314,6 @@
2498+@@ -13352,10 +13314,6 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
2499 NULL);
2500 }
2501
2502@@ -3460,9 +3861,11 @@
2503 }
2504
2505 if (!gtk_widget_in_destruction (GTK_WIDGET (tree_view)))
2506+diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
2507+index 366b3aa..4159f85 100644
2508 --- a/gtk/gtktreeviewcolumn.c
2509 +++ b/gtk/gtktreeviewcolumn.c
2510-@@ -1889,12 +1889,6 @@
2511+@@ -1889,12 +1889,6 @@ gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
2512 if (priv->visible)
2513 _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
2514
2515@@ -3475,9 +3878,11 @@
2516 gtk_tree_view_column_update_button (tree_column);
2517 g_object_notify_by_pspec (G_OBJECT (tree_column), tree_column_props[PROP_VISIBLE]);
2518 }
2519+diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
2520+index 601d5a1..c81ce62 100644
2521 --- a/gtk/gtkviewport.c
2522 +++ b/gtk/gtkviewport.c
2523-@@ -390,8 +390,6 @@
2524+@@ -390,8 +390,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
2525 widget_class->get_preferred_height_for_width = gtk_viewport_get_preferred_height_for_width;
2526 widget_class->queue_draw_region = gtk_viewport_queue_draw_region;
2527
2528@@ -3486,9 +3891,11 @@
2529 container_class->remove = gtk_viewport_remove;
2530 container_class->add = gtk_viewport_add;
2531 gtk_container_class_handle_border_width (container_class);
2532+diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
2533+index f406492..e6a103c 100644
2534 --- a/gtk/gtkvolumebutton.c
2535 +++ b/gtk/gtkvolumebutton.c
2536-@@ -183,10 +183,6 @@
2537+@@ -183,10 +183,6 @@ gtk_volume_button_init (GtkVolumeButton *button)
2538 GtkWidget *widget = GTK_WIDGET (button);
2539
2540 gtk_widget_init_template (widget);
2541@@ -3499,18 +3906,17 @@
2542 }
2543
2544 /**
2545-@@ -220,10 +216,7 @@
2546+@@ -220,9 +216,6 @@ cb_query_tooltip (GtkWidget *button,
2547 GtkAdjustment *adjustment;
2548 gdouble val;
2549 char *str;
2550 - AtkImage *image;
2551-
2552-- image = ATK_IMAGE (gtk_widget_get_accessible (button));
2553 -
2554+- image = ATK_IMAGE (gtk_widget_get_accessible (button));
2555+
2556 adjustment = gtk_scale_button_get_adjustment (scale_button);
2557 val = gtk_scale_button_get_value (scale_button);
2558-
2559-@@ -250,7 +243,6 @@
2560+@@ -250,7 +243,6 @@ cb_query_tooltip (GtkWidget *button,
2561 }
2562
2563 gtk_tooltip_set_text (tooltip, str);
2564@@ -3518,9 +3924,11 @@
2565 g_free (str);
2566
2567 return TRUE;
2568+diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
2569+index b6e0011..789905a 100644
2570 --- a/gtk/gtkwidget.c
2571 +++ b/gtk/gtkwidget.c
2572-@@ -496,8 +496,6 @@
2573+@@ -496,8 +496,6 @@ typedef struct {
2574 struct _GtkWidgetClassPrivate
2575 {
2576 GtkWidgetTemplate *template;
2577@@ -3529,7 +3937,7 @@
2578 const char *css_name;
2579 };
2580
2581-@@ -738,9 +736,6 @@
2582+@@ -738,9 +736,6 @@ static void gtk_widget_real_state_flags_changed (GtkWidget
2583 GtkStateFlags old_state);
2584 static void gtk_widget_real_queue_draw_region (GtkWidget *widget,
2585 const cairo_region_t *region);
2586@@ -3539,7 +3947,7 @@
2587 static void gtk_widget_invalidate_widget_windows (GtkWidget *widget,
2588 cairo_region_t *region);
2589 static GdkScreen * gtk_widget_get_screen_unchecked (GtkWidget *widget);
2590-@@ -878,13 +873,6 @@
2591+@@ -878,13 +873,6 @@ gtk_widget_get_type (void)
2592 NULL, /* value_table */
2593 };
2594
2595@@ -3553,7 +3961,7 @@
2596 const GInterfaceInfo buildable_info =
2597 {
2598 (GInterfaceInitFunc) gtk_widget_buildable_interface_init,
2599-@@ -900,8 +888,6 @@
2600+@@ -900,8 +888,6 @@ gtk_widget_get_type (void)
2601 GtkWidget_private_offset =
2602 g_type_add_instance_private (widget_type, sizeof (GtkWidgetPrivate));
2603
2604@@ -3562,7 +3970,7 @@
2605 g_type_add_interface_static (widget_type, GTK_TYPE_BUILDABLE,
2606 &buildable_info) ;
2607 }
2608-@@ -1106,11 +1092,6 @@
2609+@@ -1106,11 +1092,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
2610
2611 klass->show_help = gtk_widget_real_show_help;
2612
2613@@ -3574,7 +3982,7 @@
2614 klass->adjust_size_request = gtk_widget_real_adjust_size_request;
2615 klass->adjust_baseline_request = gtk_widget_real_adjust_baseline_request;
2616 klass->adjust_size_allocation = gtk_widget_real_adjust_size_allocation;
2617-@@ -3722,7 +3703,6 @@
2618+@@ -3722,7 +3703,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
2619 1, G_MAXINT, 20,
2620 GTK_PARAM_READABLE));
2621
2622@@ -3582,7 +3990,7 @@
2623 gtk_widget_class_set_css_name (klass, "widget");
2624 }
2625
2626-@@ -12332,13 +12312,6 @@
2627+@@ -12332,13 +12312,6 @@ gtk_widget_real_destroy (GtkWidget *object)
2628 }
2629 }
2630
2631@@ -3596,7 +4004,7 @@
2632 /* wipe accelerator closures (keep order) */
2633 g_object_set_qdata (G_OBJECT (widget), quark_accel_path, NULL);
2634 g_object_set_qdata (G_OBJECT (widget), quark_accel_closures, NULL);
2635-@@ -12371,8 +12344,6 @@
2636+@@ -12371,8 +12344,6 @@ gtk_widget_finalize (GObject *object)
2637
2638 g_free (priv->name);
2639
2640@@ -3605,7 +4013,7 @@
2641 gtk_widget_clear_path (widget);
2642
2643 gtk_css_widget_node_widget_destroyed (GTK_CSS_WIDGET_NODE (priv->cssnode));
2644-@@ -13420,191 +13391,7 @@
2645+@@ -13420,190 +13391,6 @@ G_DEFINE_BOXED_TYPE (GtkRequisition, gtk_requisition,
2646 gtk_requisition_copy,
2647 gtk_requisition_free)
2648
2649@@ -3772,7 +4180,7 @@
2650 - return accessible;
2651 -}
2652 -
2653- /*
2654+-/*
2655 - * Initialize a AtkImplementorIface instance’s virtual pointers as
2656 - * appropriate to this implementor’s class (GtkWidget).
2657 - */
2658@@ -3793,11 +4201,10 @@
2659 - return accessible;
2660 -}
2661 -
2662--/*
2663+ /*
2664 * Expand flag management
2665 */
2666-
2667-@@ -14072,9 +13859,6 @@
2668+@@ -14072,9 +13859,6 @@ gtk_widget_buildable_get_internal_child (GtkBuildable *buildable,
2669 GSList *l;
2670 GType internal_child_type = 0;
2671
2672@@ -3807,7 +4214,7 @@
2673 /* Find a widget type which has declared an automated child as internal by
2674 * the name 'childname', if any.
2675 */
2676-@@ -14122,44 +13906,10 @@
2677+@@ -14122,44 +13906,10 @@ gtk_widget_buildable_set_buildable_property (GtkBuildable *buildable,
2678 g_object_set_property (G_OBJECT (buildable), name, value);
2679 }
2680
2681@@ -3827,7 +4234,7 @@
2682 - gint col;
2683 -} AtkRelationData;
2684 -
2685- static void
2686+-static void
2687 -free_action (AtkActionData *data, gpointer user_data)
2688 -{
2689 - g_free (data->action_name);
2690@@ -3843,7 +4250,7 @@
2691 - g_slice_free (AtkRelationData, data);
2692 -}
2693 -
2694--static void
2695+ static void
2696 gtk_widget_buildable_parser_finished (GtkBuildable *buildable,
2697 GtkBuilder *builder)
2698 {
2699@@ -3852,7 +4259,7 @@
2700 if (g_object_get_qdata (G_OBJECT (buildable), quark_builder_has_default))
2701 {
2702 gtk_widget_grab_default (GTK_WIDGET (buildable));
2703-@@ -14171,37 +13921,6 @@
2704+@@ -14171,37 +13921,6 @@ gtk_widget_buildable_parser_finished (GtkBuildable *buildable,
2705 gtk_widget_grab_focus (GTK_WIDGET (buildable));
2706 g_object_steal_qdata (G_OBJECT (buildable), quark_builder_has_focus);
2707 }
2708@@ -3890,7 +4297,7 @@
2709 }
2710
2711 typedef struct
2712-@@ -14211,125 +13930,6 @@
2713+@@ -14211,125 +13930,6 @@ typedef struct
2714 GSList *relations;
2715 } AccessibilitySubParserData;
2716
2717@@ -4016,7 +4423,7 @@
2718 typedef struct
2719 {
2720 GObject *object;
2721-@@ -14492,19 +14092,6 @@
2722+@@ -14492,19 +14092,6 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
2723 return TRUE;
2724 }
2725
2726@@ -4036,11 +4443,10 @@
2727 if (strcmp (tagname, "style") == 0)
2728 {
2729 StyleParserData *data;
2730-@@ -14577,62 +14164,6 @@
2731- toplevel = _gtk_widget_get_toplevel (GTK_WIDGET (accel_data->object));
2732+@@ -14578,62 +14165,6 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
2733
2734 _gtk_widget_buildable_finish_accelerator (GTK_WIDGET (buildable), toplevel, user_data);
2735-- }
2736+ }
2737 - else if (strcmp (tagname, "accessibility") == 0)
2738 - {
2739 - AccessibilitySubParserData *a11y_data;
2740@@ -4096,9 +4502,12 @@
2741 - a11y_data->relations);
2742 -
2743 - g_slice_free (AccessibilitySubParserData, a11y_data);
2744- }
2745+- }
2746 else if (strcmp (tagname, "style") == 0)
2747 {
2748+ StyleParserData *style_data = (StyleParserData *)user_data;
2749+diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
2750+index 3dada84..27dbd68 100644
2751 --- a/gtk/gtkwidget.h
2752 +++ b/gtk/gtkwidget.h
2753 @@ -33,7 +33,6 @@
2754@@ -4109,7 +4518,7 @@
2755
2756 G_BEGIN_DECLS
2757
2758-@@ -305,8 +304,6 @@
2759+@@ -305,8 +304,6 @@ struct _GtkWidget
2760 * @popup_menu: Signal emitted whenever a widget should pop up a
2761 * context menu.
2762 * @show_help:
2763@@ -4118,7 +4527,7 @@
2764 * @screen_changed: Signal emitted when the screen of a widget has
2765 * changed.
2766 * @can_activate_accel: Signal allows applications and derived widgets
2767-@@ -549,8 +546,6 @@
2768+@@ -549,8 +546,6 @@ struct _GtkWidgetClass
2769
2770 /* accessibility support
2771 */
2772@@ -4127,11 +4536,10 @@
2773 void (* screen_changed) (GtkWidget *widget,
2774 GdkScreen *previous_screen);
2775 gboolean (* can_activate_accel) (GtkWidget *widget,
2776-@@ -1055,16 +1050,6 @@
2777- GDK_AVAILABLE_IN_ALL
2778+@@ -1056,16 +1051,6 @@ GDK_AVAILABLE_IN_ALL
2779 void gtk_widget_set_support_multidevice (GtkWidget *widget,
2780 gboolean support_multidevice);
2781--
2782+
2783 -/* Accessibility support */
2784 -GDK_AVAILABLE_IN_3_2
2785 -void gtk_widget_class_set_accessible_type (GtkWidgetClass *widget_class,
2786@@ -4141,12 +4549,15 @@
2787 - AtkRole role);
2788 -GDK_AVAILABLE_IN_ALL
2789 -AtkObject* gtk_widget_get_accessible (GtkWidget *widget);
2790-
2791+-
2792
2793 /* Margin and alignment */
2794+ GDK_AVAILABLE_IN_ALL
2795+diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
2796+index 1b7ddf2..22dc342 100644
2797 --- a/gtk/gtkwidgetprivate.h
2798 +++ b/gtk/gtkwidgetprivate.h
2799-@@ -158,8 +158,6 @@
2800+@@ -158,8 +158,6 @@ struct _GtkWidgetPrivate
2801 GtkWidget *parent;
2802
2803 GList *event_controllers;
2804@@ -4155,704 +4566,15 @@
2805 };
2806
2807 GtkCssNode * gtk_widget_get_css_node (GtkWidget *widget);
2808-@@ -212,8 +210,6 @@
2809-
2810+@@ -213,8 +211,6 @@ gboolean _gtk_widget_has_baseline_support (GtkWidget *widget);
2811 const gchar* _gtk_widget_get_accel_path (GtkWidget *widget,
2812 gboolean *locked);
2813--
2814--AtkObject * _gtk_widget_peek_accessible (GtkWidget *widget);
2815
2816+-AtkObject * _gtk_widget_peek_accessible (GtkWidget *widget);
2817+-
2818 void _gtk_widget_set_has_default (GtkWidget *widget,
2819 gboolean has_default);
2820---- a/gtk/gtkwindow.c
2821-+++ b/gtk/gtkwindow.c
2822-@@ -60,7 +60,6 @@
2823- #include "gtkheaderbarprivate.h"
2824- #include "gtkpopoverprivate.h"
2825- #include "a11y/gtkwindowaccessible.h"
2826--#include "a11y/gtkcontaineraccessibleprivate.h"
2827- #include "gtkapplicationprivate.h"
2828- #include "gtkgestureprivate.h"
2829- #include "inspector/init.h"
2830-@@ -1270,7 +1269,6 @@
2831- add_tab_bindings (binding_set, GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
2832- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
2833-
2834-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_WINDOW_ACCESSIBLE);
2835- gtk_widget_class_set_css_name (widget_class, "window");
2836- }
2837-
2838-@@ -12478,7 +12476,6 @@
2839- {
2840- GtkWindowPrivate *priv;
2841- GtkWindowPopover *data;
2842-- AtkObject *accessible;
2843-
2844- g_return_if_fail (GTK_IS_WINDOW (window));
2845- g_return_if_fail (GTK_IS_WIDGET (popover));
2846-@@ -12501,10 +12498,6 @@
2847- popover_realize (popover, data, window);
2848-
2849- gtk_widget_set_parent (popover, GTK_WIDGET (window));
2850--
2851-- accessible = gtk_widget_get_accessible (GTK_WIDGET (window));
2852-- _gtk_container_accessible_add_child (GTK_CONTAINER_ACCESSIBLE (accessible),
2853-- gtk_widget_get_accessible (popover), -1);
2854- }
2855-
2856- void
2857-@@ -12513,7 +12506,6 @@
2858- {
2859- GtkWindowPrivate *priv;
2860- GtkWindowPopover *data;
2861-- AtkObject *accessible;
2862-
2863- g_return_if_fail (GTK_IS_WINDOW (window));
2864- g_return_if_fail (GTK_IS_WIDGET (popover));
2865-@@ -12535,9 +12527,6 @@
2866-
2867- priv->popovers = g_list_remove (priv->popovers, data);
2868-
2869-- accessible = gtk_widget_get_accessible (GTK_WIDGET (window));
2870-- _gtk_container_accessible_remove_child (GTK_CONTAINER_ACCESSIBLE (accessible),
2871-- gtk_widget_get_accessible (popover), -1);
2872- popover_destroy (data);
2873- g_object_unref (popover);
2874- }
2875---- a/gtk/inspector/misc-info.c
2876-+++ b/gtk/inspector/misc-info.c
2877-@@ -68,12 +68,6 @@
2878- GtkWidget *framerate;
2879- GtkWidget *framecount_row;
2880- GtkWidget *framecount;
2881-- GtkWidget *accessible_role_row;
2882-- GtkWidget *accessible_role;
2883-- GtkWidget *accessible_name_row;
2884-- GtkWidget *accessible_name;
2885-- GtkWidget *accessible_description_row;
2886-- GtkWidget *accessible_description;
2887- GtkWidget *mapped_row;
2888- GtkWidget *mapped;
2889- GtkWidget *realized_row;
2890-@@ -337,8 +331,6 @@
2891-
2892- if (GTK_IS_WIDGET (sl->priv->object))
2893- {
2894-- AtkObject *accessible;
2895-- AtkRole role;
2896- GList *list, *l;
2897-
2898- gtk_container_forall (GTK_CONTAINER (sl->priv->mnemonic_label), (GtkCallback)gtk_widget_destroy, NULL);
2899-@@ -359,11 +351,6 @@
2900-
2901- gtk_widget_set_visible (sl->priv->tick_callback, gtk_widget_has_tick_callback (GTK_WIDGET (sl->priv->object)));
2902-
2903-- accessible = ATK_OBJECT (gtk_widget_get_accessible (GTK_WIDGET (sl->priv->object)));
2904-- role = atk_object_get_role (accessible);
2905-- gtk_label_set_text (GTK_LABEL (sl->priv->accessible_role), atk_role_get_name (role));
2906-- gtk_label_set_text (GTK_LABEL (sl->priv->accessible_name), atk_object_get_name (accessible));
2907-- gtk_label_set_text (GTK_LABEL (sl->priv->accessible_description), atk_object_get_description (accessible));
2908- gtk_widget_set_visible (sl->priv->mapped, gtk_widget_get_mapped (GTK_WIDGET (sl->priv->object)));
2909- gtk_widget_set_visible (sl->priv->realized, gtk_widget_get_realized (GTK_WIDGET (sl->priv->object)));
2910- gtk_widget_set_visible (sl->priv->is_toplevel, gtk_widget_is_toplevel (GTK_WIDGET (sl->priv->object)));
2911-@@ -454,9 +441,6 @@
2912- gtk_widget_show (sl->priv->clip_area_row);
2913- gtk_widget_show (sl->priv->mnemonic_label_row);
2914- gtk_widget_show (sl->priv->tick_callback_row);
2915-- gtk_widget_show (sl->priv->accessible_role_row);
2916-- gtk_widget_show (sl->priv->accessible_name_row);
2917-- gtk_widget_show (sl->priv->accessible_description_row);
2918- gtk_widget_show (sl->priv->mapped_row);
2919- gtk_widget_show (sl->priv->realized_row);
2920- gtk_widget_show (sl->priv->is_toplevel_row);
2921-@@ -478,9 +462,6 @@
2922- gtk_widget_hide (sl->priv->baseline_row);
2923- gtk_widget_hide (sl->priv->clip_area_row);
2924- gtk_widget_hide (sl->priv->tick_callback_row);
2925-- gtk_widget_hide (sl->priv->accessible_role_row);
2926-- gtk_widget_hide (sl->priv->accessible_name_row);
2927-- gtk_widget_hide (sl->priv->accessible_description_row);
2928- gtk_widget_hide (sl->priv->mapped_row);
2929- gtk_widget_hide (sl->priv->realized_row);
2930- gtk_widget_hide (sl->priv->is_toplevel_row);
2931-@@ -642,12 +623,6 @@
2932- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, framecount);
2933- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, framerate_row);
2934- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, framerate);
2935-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_role_row);
2936-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_role);
2937-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_name_row);
2938-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_name);
2939-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_description_row);
2940-- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, accessible_description);
2941- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, mapped_row);
2942- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, mapped);
2943- gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorMiscInfo, realized_row);
2944---- a/gtk/meson.build
2945-+++ b/gtk/meson.build
2946-@@ -1,5 +1,4 @@
2947- subdir('deprecated')
2948--subdir('a11y')
2949- subdir('inspector')
2950-
2951- gtk_cargs = [
2952-@@ -32,7 +31,6 @@
2953- 'gtkaccelgroup.c',
2954- 'gtkaccellabel.c',
2955- 'gtkaccelmap.c',
2956-- 'gtkaccessible.c',
2957- 'gtkactionbar.c',
2958- 'gtkactionhelper.c',
2959- 'gtkadjustment.c',
2960-@@ -396,12 +394,10 @@
2961- 'gtk.h',
2962- 'gtk-autocleanups.h',
2963- 'gtkx-autocleanups.h',
2964-- 'gtk-a11y.h',
2965- 'gtkaboutdialog.h',
2966- 'gtkaccelgroup.h',
2967- 'gtkaccellabel.h',
2968- 'gtkaccelmap.h',
2969-- 'gtkaccessible.h',
2970- 'gtkactionable.h',
2971- 'gtkactionbar.h',
2972- 'gtkadjustment.h',
2973-@@ -761,7 +757,7 @@
2974- gtkmarshal_h = gtkmarshalers[1]
2975-
2976- gtktypebuiltins = gnome.mkenums('gtktypebuiltins',
2977-- sources: gtk_public_headers + gtk_deprecated_headers + a11y_headers,
2978-+ sources: gtk_public_headers + gtk_deprecated_headers,
2979- c_template: 'gtktypebuiltins.c.template',
2980- h_template: 'gtktypebuiltins.h.template',
2981- install_dir: join_paths(gtk_includedir, 'gtk-3.0/gtk'),
2982-@@ -820,7 +816,6 @@
2983- gtk_dbus_src,
2984- gtk_deprecated_sources,
2985- inspector_sources,
2986-- a11y_sources,
2987- gtkresources,
2988- gtkmarshalers,
2989- gtkprivatetypebuiltins,
2990-@@ -840,7 +835,6 @@
2991- cairo_dep,
2992- fontconfig_dep,
2993- pixbuf_dep,
2994-- atk_dep,
2995- epoxy_dep,
2996- libm,
2997- ]
2998-@@ -896,8 +890,6 @@
2999- )
3000- gtk_res = import('windows').compile_resources(gtk_rc)
3001- gtk_sources += gtk_res
3002--else
3003-- gtk_deps += [ atkbridge_dep, ]
3004- endif
3005-
3006- if quartz_enabled
3007-@@ -991,15 +983,12 @@
3008- gtk_gir_public_headers,
3009- gtk_deprecated_headers,
3010- gtk_sources,
3011-- a11y_headers,
3012-- a11y_sources,
3013- gtktypebuiltins_h,
3014- gtkversion,
3015- ]
3016-
3017-- gtk_gir_includes = [gdk_gir[0], 'Atk-1.0']
3018-- gtk_gir_extra_args = gir_args + ['-DGTK_COMPILATION',
3019-- '--c-include=gtk/gtk-a11y.h']
3020-+ gtk_gir_includes = gdk_gir[0]
3021-+ gtk_gir_extra_args = gir_args + ['-DGTK_COMPILATION']
3022- if x11_enabled
3023- gtk_gir_includes += ['xlib-2.0']
3024- gtk_gir_extra_args += ['--c-include=gtk/gtkx.h']
3025---- a/gtk/ui/gtkcoloreditor.ui
3026-+++ b/gtk/ui/gtkcoloreditor.ui
3027-@@ -84,11 +84,6 @@
3028- <property name="visible">1</property>
3029- <property name="can-focus">1</property>
3030- <property name="invisible-char">•</property>
3031-- <child internal-child="accessible">
3032-- <object class="AtkObject" id="entry-atkobject">
3033-- <property name="AtkObject::accessible-name" translatable="yes">Color Name</property>
3034-- </object>
3035-- </child>
3036- <signal name="activate" handler="entry_apply" swapped="no"/>
3037- <signal name="focus-out-event" handler="entry_focus_out" swapped="no"/>
3038- <signal name="notify::text" handler="entry_text_changed" swapped="no"/>
3039-@@ -191,11 +186,6 @@
3040- <property name="width-chars">2</property>
3041- <property name="max-width-chars">2</property>
3042- <property name="climb-rate">1</property>
3043-- <child internal-child="accessible">
3044-- <object class="AtkObject" id="a_entry-atkobject">
3045-- <property name="AtkObject::accessible-name" translatable="yes">Alpha</property>
3046-- </object>
3047-- </child>
3048- <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
3049- </object>
3050- <packing>
3051-@@ -238,11 +228,6 @@
3052- <property name="width-chars">2</property>
3053- <property name="max-width-chars">2</property>
3054- <property name="climb-rate">1</property>
3055-- <child internal-child="accessible">
3056-- <object class="AtkObject" id="h_entry-atkobject">
3057-- <property name="AtkObject::accessible-name" translatable="yes">Hue</property>
3058-- </object>
3059-- </child>
3060- <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
3061- </object>
3062- <packing>
3063-@@ -296,11 +281,6 @@
3064- <property name="width-chars">2</property>
3065- <property name="max-width-chars">2</property>
3066- <property name="climb-rate">1</property>
3067-- <child internal-child="accessible">
3068-- <object class="AtkObject" id="s_entry-atkobject">
3069-- <property name="AtkObject::accessible-name" translatable="yes">Saturation</property>
3070-- </object>
3071-- </child>
3072- <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
3073- </object>
3074- <packing>
3075-@@ -315,11 +295,6 @@
3076- <property name="width-chars">2</property>
3077- <property name="max-width-chars">2</property>
3078- <property name="climb-rate">1</property>
3079-- <child internal-child="accessible">
3080-- <object class="AtkObject" id="v_entry-atkobject">
3081-- <property name="AtkObject::accessible-name" translatable="yes">Value</property>
3082-- </object>
3083-- </child>
3084- <signal name="key-press-event" handler="popup_key_press" swapped="no"/>
3085- </object>
3086- <packing>
3087---- a/gtk/ui/gtkfilechooserdialog.ui
3088-+++ b/gtk/ui/gtkfilechooserdialog.ui
3089-@@ -27,11 +27,6 @@
3090- <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/>
3091- <signal name="response-requested" handler="file_chooser_widget_response_requested" swapped="no"/>
3092- <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/>
3093-- <child internal-child="accessible">
3094-- <object class="AtkObject">
3095-- <property name="AtkObject::accessible-name" translatable="yes">File Chooser Widget</property>
3096-- </object>
3097-- </child>
3098- </object>
3099- <packing>
3100- <property name="expand">1</property>
3101---- a/gtk/ui/gtkfilechooserwidget.ui
3102-+++ b/gtk/ui/gtkfilechooserwidget.ui
3103-@@ -17,11 +17,6 @@
3104- <property name="hscrollbar-policy">never</property>
3105- <property name="local-only">1</property>
3106- <property name="show-other-locations">1</property>
3107-- <child internal-child="accessible">
3108-- <object class="AtkObject">
3109-- <property name="AtkObject::accessible-name" translatable="yes">Places</property>
3110-- </object>
3111-- </child>
3112- <style>
3113- <class name="sidebar"/>
3114- </style>
3115-@@ -42,11 +37,6 @@
3116- <object class="GtkRevealer" id="browse_header_revealer">
3117- <property name="visible">1</property>
3118- <property name="hexpand">1</property>
3119-- <child internal-child="accessible">
3120-- <object class="AtkObject">
3121-- <property name="AtkObject::accessible-name" translatable="yes">Browse Header Revealer</property>
3122-- </object>
3123-- </child>
3124- <child>
3125- <object class="GtkBox">
3126- <property name="visible">1</property>
3127-@@ -60,21 +50,11 @@
3128- <object class="GtkStack" id="browse_header_stack">
3129- <property name="visible">1</property>
3130- <property name="transition-type">crossfade</property>
3131-- <child internal-child="accessible">
3132-- <object class="AtkObject">
3133-- <property name="AtkObject::accessible-name" translatable="yes">Browse Header Stack</property>
3134-- </object>
3135-- </child>
3136- <child>
3137- <object class="GtkBox">
3138- <property name="visible">1</property>
3139- <property name="spacing">6</property>
3140- <property name="border-width">6</property>
3141-- <child internal-child="accessible">
3142-- <object class="AtkObject">
3143-- <property name="AtkObject::accessible-name" translatable="yes">PathBar Layer</property>
3144-- </object>
3145-- </child>
3146- <child>
3147- <object class="GtkPathBar" id="browse_path_bar">
3148- <property name="visible">True</property>
3149-@@ -116,12 +96,7 @@
3150- <property name="no-show-all">1</property>
3151- <property name="spacing">6</property>
3152- <property name="border-width">6</property>
3153-- <child internal-child="accessible">
3154-- <object class="AtkObject">
3155-- <property name="AtkObject::accessible-name" translatable="yes">Location Layer</property>
3156- </object>
3157-- </child>
3158-- </object>
3159- <packing>
3160- <property name="name">location</property>
3161- </packing>
3162-@@ -132,11 +107,6 @@
3163- <property name="no-show-all">1</property>
3164- <property name="spacing">6</property>
3165- <property name="border-width">6</property>
3166-- <child internal-child="accessible">
3167-- <object class="AtkObject">
3168-- <property name="AtkObject::accessible-name" translatable="yes">Search Layer</property>
3169-- </object>
3170-- </child>
3171- <child type="center">
3172- <object class="GtkSearchEntry" id="search_entry">
3173- <property name="visible">1</property>
3174-@@ -194,11 +164,6 @@
3175- <property name="visible">1</property>
3176- <property name="has-tooltip">1</property>
3177- <property name="enable-search">0</property>
3178-- <child internal-child="accessible">
3179-- <object class="AtkObject" id="browse_files_tree_view-atkobject">
3180-- <property name="AtkObject::accessible-name" translatable="yes">Files</property>
3181-- </object>
3182-- </child>
3183- <signal name="button-press-event" handler="list_button_press_event_cb" swapped="no"/>
3184- <signal name="drag-data-received" handler="file_list_drag_data_received_cb" swapped="no"/>
3185- <signal name="drag-drop" handler="file_list_drag_drop_cb" swapped="no"/>
3186---- a/gtk/ui/gtkpathbar.ui
3187-+++ b/gtk/ui/gtkpathbar.ui
3188-@@ -6,11 +6,6 @@
3189- <property name="can-focus">1</property>
3190- <property name="receives-default">1</property>
3191- <property name="focus-on-click">0</property>
3192-- <child internal-child="accessible">
3193-- <object class="AtkObject" id="down_slider_button-atkobject">
3194-- <property name="AtkObject::accessible-name" translatable="yes">Down Path</property>
3195-- </object>
3196-- </child>
3197- <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
3198- <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
3199- <signal name="focus-out-event" handler="gtk_path_bar_slider_down_defocus" swapped="no"/>
3200-@@ -31,11 +26,6 @@
3201- <property name="can-focus">1</property>
3202- <property name="receives-default">1</property>
3203- <property name="focus-on-click">0</property>
3204-- <child internal-child="accessible">
3205-- <object class="AtkObject" id="up_slider_button-atkobject">
3206-- <property name="AtkObject::accessible-name" translatable="yes">Up Path</property>
3207-- </object>
3208-- </child>
3209- <signal name="button-press-event" handler="gtk_path_bar_slider_button_press" swapped="no"/>
3210- <signal name="button-release-event" handler="gtk_path_bar_slider_button_release" swapped="no"/>
3211- <signal name="focus-out-event" handler="gtk_path_bar_slider_up_defocus" swapped="no"/>
3212---- a/gtk/ui/gtkprintunixdialog.ui
3213-+++ b/gtk/ui/gtkprintunixdialog.ui
3214-@@ -182,9 +182,6 @@
3215- <attributes>
3216- <attribute name="weight" value="bold"/>
3217- </attributes>
3218-- <accessibility>
3219-- <relation type="label-for" target="range_table"/>
3220-- </accessibility>
3221- </object>
3222- <packing>
3223- <property name="fill">0</property>
3224-@@ -271,22 +268,12 @@
3225- e.g. 1–3, 7, 11</property>
3226- <property name="invisible-char">•</property>
3227- <property name="activates-default">1</property>
3228-- <child internal-child="accessible">
3229-- <object class="AtkObject" id="page_range_entry-atkobject">
3230-- <property name="AtkObject::accessible-name" translatable="yes">Pages</property>
3231-- <property name="AtkObject::accessible-description" translatable="yes">Specify one or more page ranges,
3232-- e.g. 1–3, 7, 11</property>
3233-- </object>
3234-- </child>
3235- </object>
3236- <packing>
3237- <property name="left-attach">1</property>
3238- <property name="top-attach">3</property>
3239- </packing>
3240- </child>
3241-- <accessibility>
3242-- <relation type="labelled-by" target="label_widget1"/>
3243-- </accessibility>
3244- </object>
3245- <packing>
3246- <property name="fill">0</property>
3247-@@ -312,9 +299,6 @@
3248- <attributes>
3249- <attribute name="weight" value="bold"/>
3250- </attributes>
3251-- <accessibility>
3252-- <relation type="label-for" target="grid1"/>
3253-- </accessibility>
3254- </object>
3255- <packing>
3256- <property name="fill">0</property>
3257-@@ -397,9 +381,6 @@
3258- <property name="height">2</property>
3259- </packing>
3260- </child>
3261-- <accessibility>
3262-- <relation type="labelled-by" target="label_widget2"/>
3263-- </accessibility>
3264- </object>
3265- <packing>
3266- <property name="fill">0</property>
3267-@@ -453,9 +434,6 @@
3268- <attributes>
3269- <attribute name="weight" value="bold"/>
3270- </attributes>
3271-- <accessibility>
3272-- <relation type="label-for" target="grid2"/>
3273-- </accessibility>
3274- </object>
3275- <packing>
3276- <property name="fill">0</property>
3277-@@ -622,9 +600,6 @@
3278- <property name="top-attach">4</property>
3279- </packing>
3280- </child>
3281-- <accessibility>
3282-- <relation type="labelled-by" target="label_widget3"/>
3283-- </accessibility>
3284- </object>
3285- <packing>
3286- <property name="fill">0</property>
3287-@@ -650,9 +625,6 @@
3288- <attributes>
3289- <attribute name="weight" value="bold"/>
3290- </attributes>
3291-- <accessibility>
3292-- <relation type="label-for" target="grid3"/>
3293-- </accessibility>
3294- </object>
3295- <packing>
3296- <property name="fill">0</property>
3297-@@ -802,9 +774,6 @@
3298- <property name="top-attach">4</property>
3299- </packing>
3300- </child>
3301-- <accessibility>
3302-- <relation type="labelled-by" target="label_widget4"/>
3303-- </accessibility>
3304- </object>
3305- <packing>
3306- <property name="fill">0</property>
3307-@@ -877,9 +846,6 @@
3308- <attributes>
3309- <attribute name="weight" value="bold"/>
3310- </attributes>
3311-- <accessibility>
3312-- <relation type="label-for" target="grid5"/>
3313-- </accessibility>
3314- </object>
3315- <packing>
3316- <property name="fill">0</property>
3317-@@ -939,9 +905,6 @@
3318- <property name="top-attach">1</property>
3319- </packing>
3320- </child>
3321-- <accessibility>
3322-- <relation type="labelled-by" target="label_widget5"/>
3323-- </accessibility>
3324- </object>
3325- <packing>
3326- <property name="fill">0</property>
3327-@@ -968,9 +931,6 @@
3328- <attributes>
3329- <attribute name="weight" value="bold"/>
3330- </attributes>
3331-- <accessibility>
3332-- <relation type="label-for" target="grid6"/>
3333-- </accessibility>
3334- </object>
3335- <packing>
3336- <property name="fill">0</property>
3337-@@ -1031,13 +991,6 @@
3338- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
3339- <property name="invisible-char">•</property>
3340- <property name="invisible-char-set">1</property>
3341-- <child internal-child="accessible">
3342-- <object class="AtkObject" id="print_at_entry-atkobject">
3343-- <property name="AtkObject::accessible-name" translatable="yes">Time of print</property>
3344-- <property name="AtkObject::accessible-description" translatable="yes">Specify the time of print,
3345-- e.g. 15∶30, 2∶35 pm, 14∶15∶20, 11∶46∶30 am, 4 pm</property>
3346-- </object>
3347-- </child>
3348- <signal name="changed" handler="update_print_at_option" object="GtkPrintUnixDialog" swapped="yes"/>
3349- </object>
3350- <packing>
3351-@@ -1064,9 +1017,6 @@
3352- <property name="width">2</property>
3353- </packing>
3354- </child>
3355-- <accessibility>
3356-- <relation type="labelled-by" target="label_widget6"/>
3357-- </accessibility>
3358- </object>
3359- <packing>
3360- <property name="fill">0</property>
3361-@@ -1093,9 +1043,6 @@
3362- <attributes>
3363- <attribute name="weight" value="bold"/>
3364- </attributes>
3365-- <accessibility>
3366-- <relation type="label-for" target="grid7"/>
3367-- </accessibility>
3368- </object>
3369- <packing>
3370- <property name="fill">0</property>
3371-@@ -1155,9 +1102,6 @@
3372- <property name="top-attach">1</property>
3373- </packing>
3374- </child>
3375-- <accessibility>
3376-- <relation type="labelled-by" target="label_widget7"/>
3377-- </accessibility>
3378- </object>
3379- <packing>
3380- <property name="fill">0</property>
3381---- a/gtk/ui/gtkvolumebutton.ui
3382-+++ b/gtk/ui/gtkvolumebutton.ui
3383-@@ -19,32 +19,14 @@
3384- audio-volume-high
3385- audio-volume-low
3386- audio-volume-medium</property>
3387-- <child internal-child="accessible">
3388-- <object class="AtkObject" id="GtkVolumeButton-atkobject">
3389-- <property name="AtkObject::accessible-name" translatable="yes">Volume</property>
3390-- <property name="AtkObject::accessible-description" translatable="yes">Turns volume up or down</property>
3391-- </object>
3392-- </child>
3393- <signal name="query-tooltip" handler="cb_query_tooltip" swapped="no"/>
3394- <signal name="value-changed" handler="cb_value_changed" swapped="no"/>
3395- <child internal-child="plus_button">
3396- <object class="GtkButton" id="scalebutton-plus_button1">
3397-- <child internal-child="accessible">
3398-- <object class="AtkObject" id="scalebutton-plus_button1-atkobject">
3399-- <property name="AtkObject::accessible-name" translatable="yes">Volume Up</property>
3400-- <property name="AtkObject::accessible-description" translatable="yes">Increases the volume</property>
3401- </object>
3402- </child>
3403-- </object>
3404-- </child>
3405- <child internal-child="minus_button">
3406- <object class="GtkButton" id="scalebutton-minus_button1">
3407-- <child internal-child="accessible">
3408-- <object class="AtkObject" id="scalebutton-minus_button1-atkobject">
3409-- <property name="AtkObject::accessible-name" translatable="yes">Volume Down</property>
3410-- <property name="AtkObject::accessible-description" translatable="yes">Decreases the volume</property>
3411-- </object>
3412-- </child>
3413- </object>
3414- </child>
3415- </template>
3416---- a/meson.build
3417-+++ b/meson.build
3418-@@ -25,8 +25,6 @@
3419-
3420- glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req)
3421- pango_req = '>= 1.41.0'
3422--atk_req = '>= 2.35.1'
3423--at_spi2_atk_req = '>= 2.15.1'
3424- cairo_req = '>= 1.14.0'
3425- gdk_pixbuf_req = '>= 2.30.0'
3426- introspection_req = '>= 1.39.0'
3427-@@ -289,7 +287,7 @@
3428- test_cflags = [
3429- '-fno-strict-aliasing',
3430- '-Wpointer-arith',
3431-- '-Wimplicit-function-declaration',
3432-+ '-Werror=implicit-function-declaration',
3433- '-Wformat=2',
3434- '-Wformat-security',
3435- '-Wnested-externs',
3436-@@ -354,7 +352,6 @@
3437- confinc = include_directories('.')
3438- gdkinc = include_directories('gdk')
3439- gtkinc = include_directories('gtk')
3440--libgailutilinc = include_directories('libgail-util')
3441- testinc = include_directories('tests')
3442-
3443- # Dependencies
3444-@@ -449,8 +446,6 @@
3445- fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])
3446- epoxy_dep = dependency('epoxy', version: epoxy_req,
3447- fallback: ['libepoxy', 'libepoxy_dep'])
3448--atk_dep = dependency('atk', version: atk_req,
3449-- fallback : ['atk', 'libatk_dep'])
3450-
3451- # Update once Meson can have deps declared in a declarative manner or can
3452- # find deps properly with CMake again
3453-@@ -459,7 +454,6 @@
3454- iso_codes_dep = dependency('iso-codes', required: false)
3455-
3456- fontconfig_dep = [] # only used in x11 backend
3457--atkbridge_dep = [] # only used in x11 backend
3458-
3459- if os_win32
3460- platform_gio_dep = giowin32_dep
3461-@@ -548,8 +542,6 @@
3462- cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found() ? 1 : false)
3463- cdata.set('HAVE_PANGOFT', pangoft_dep.found() ? 1 : false)
3464-
3465--atk_pkgs = ['atk']
3466--
3467- wayland_pkgs = []
3468- if wayland_enabled
3469- wlclientdep = dependency('wayland-client', version: wayland_req)
3470-@@ -579,7 +571,6 @@
3471- xfixes_dep = dependency('xfixes', required: false)
3472- xcomposite_dep = dependency('xcomposite', required: false)
3473- fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
3474-- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
3475-
3476- backend_immodules += ['xim']
3477-
3478-@@ -598,8 +589,6 @@
3479- x11_pkgs += ['xdamage']
3480- endif
3481-
3482-- atk_pkgs += ['atk-bridge-2.0']
3483--
3484- cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
3485- cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)
3486- cdata.set('HAVE_XCOMPOSITE', xcomposite_dep.found() ? 1 : false)
3487-@@ -866,7 +855,6 @@
3488- subdir('gdk')
3489- subdir('gtk')
3490- subdir('modules')
3491--subdir('libgail-util')
3492- if get_option('demos')
3493- subdir('demos')
3494- endif
3495-@@ -928,7 +916,6 @@
3496- ['epoxy', epoxy_req] + cloudproviders_packages))
3497-
3498- gtk_packages = ' '.join([
3499-- atk_dep.name(), atk_req,
3500- cairo_packages,
3501- pixbuf_dep.name(), gdk_pixbuf_req,
3502- 'gio-2.0', glib_req,
3503-@@ -938,7 +925,7 @@
3504- # Requires.private
3505- pc_gdk_extra_libs += cairo_libs
3506-
3507--gtk_private_packages = atk_pkgs + wayland_pkgs + ['epoxy', epoxy_req]
3508-+gtk_private_packages = wayland_pkgs + ['epoxy', epoxy_req]
3509- if wayland_enabled or x11_enabled
3510- gtk_private_packages += ['pangoft2']
3511- endif
3512+ void _gtk_widget_set_has_grab (GtkWidget *widget,
3513+--
3514+2.44.0
3515+
+0,
-62
1@@ -1,62 +0,0 @@
2-From f8e2e254c5a6cba2f6cf267bd8c3ce796779a2e8 Mon Sep 17 00:00:00 2001
3-From: Ronan Pigott <rpigott@berkeley.edu>
4-Date: Sun, 22 Aug 2021 01:54:39 -0700
5-Subject: [PATCH] Revert "Revert "wayland: Push NULL buffer when hiding a
6- GdkWindow""
7-
8-wayland: Push NULL buffer when hiding a GdkWindow
9-
10-This is how windows are hidden in xdg_shell stable.
11-
12-This reverts commit bbcc3ee45643ccdc25bc525b4d7f7daf6b25440a.
13-
14-Closes #4198
15----
16- gdk/wayland/gdkwindow-wayland.c | 11 +++++++----
17- 1 file changed, 7 insertions(+), 4 deletions(-)
18-
19-diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
20-index 2d7c42bd7a..07f77eb596 100644
21---- a/gdk/wayland/gdkwindow-wayland.c
22-+++ b/gdk/wayland/gdkwindow-wayland.c
23-@@ -3286,7 +3286,7 @@ unmap_popups_for_window (GdkWindow *window)
24- }
25-
26- static void
27--gdk_wayland_window_hide_surface (GdkWindow *window)
28-+gdk_wayland_window_clear_surface (GdkWindow *window)
29- {
30- GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
31- GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
32-@@ -3416,7 +3416,10 @@ gdk_wayland_window_hide_surface (GdkWindow *window)
33- static void
34- gdk_wayland_window_hide (GdkWindow *window)
35- {
36-- gdk_wayland_window_hide_surface (window);
37-+ GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
38-+
39-+ wl_surface_attach (impl->display_server.wl_surface, NULL, 0, 0);
40-+ wl_surface_commit (impl->display_server.wl_surface);
41- _gdk_window_clear_update_area (window);
42- }
43-
44-@@ -3430,7 +3433,7 @@ gdk_window_wayland_withdraw (GdkWindow *window)
45-
46- g_assert (!GDK_WINDOW_IS_MAPPED (window));
47-
48-- gdk_wayland_window_hide_surface (window);
49-+ gdk_wayland_window_clear_surface (window);
50- }
51- }
52-
53-@@ -3751,7 +3754,7 @@ gdk_wayland_window_destroy (GdkWindow *window,
54- */
55- g_return_if_fail (!foreign_destroy);
56-
57-- gdk_wayland_window_hide_surface (window);
58-+ gdk_wayland_window_clear_surface (window);
59- }
60-
61- static void
62---
63-GitLab
+0,
-82
1@@ -1,82 +0,0 @@
2---- a/gtk/a11y/gtkplugaccessible.h
3-+++ b/gtk/a11y/gtkplugaccessible.h
4-@@ -24,48 +24,4 @@
5-
6- #include <gtk/a11y/gtkwindowaccessible.h>
7-
8--#if ATK_CHECK_VERSION(2,35,1)
9--
10--#define GTK_HAVE_ATK_PLUG_SET_CHILD
11--
12--G_BEGIN_DECLS
13--
14--#define GTK_TYPE_PLUG_ACCESSIBLE (gtk_plug_accessible_get_type ())
15--#define GTK_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessible))
16--#define GTK_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
17--#define GTK_IS_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG_ACCESSIBLE))
18--#define GTK_IS_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG_ACCESSIBLE))
19--#define GTK_PLUG_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
20--
21--typedef struct _GtkPlugAccessible GtkPlugAccessible;
22--typedef struct _GtkPlugAccessibleClass GtkPlugAccessibleClass;
23--typedef struct _GtkPlugAccessiblePrivate GtkPlugAccessiblePrivate;
24--
25--/**
26-- * GtkPlugAccessible:
27-- *
28-- * Since: 3.24.30
29-- */
30--struct _GtkPlugAccessible
31--{
32-- GtkWindowAccessible parent;
33--
34-- GtkPlugAccessiblePrivate *priv;
35--};
36--
37--struct _GtkPlugAccessibleClass
38--{
39-- GtkWindowAccessibleClass parent_class;
40--};
41--
42--GDK_AVAILABLE_IN_ALL
43--GType gtk_plug_accessible_get_type (void);
44--
45--GDK_AVAILABLE_IN_ALL
46--gchar *gtk_plug_accessible_get_id (GtkPlugAccessible *plug);
47--
48--G_END_DECLS
49--
50--#endif /* ATK_CHECK_VERSION(2,35,1) */
51--
52- #endif /* __GTK_PLUG_ACCESSIBLE_H__ */
53---- a/gtk/gtkplug.c
54-+++ b/gtk/gtkplug.c
55-@@ -178,8 +178,6 @@ gtk_plug_class_init (GtkPlugClass *class)
56- widget_class->unmap = gtk_plug_unmap;
57- widget_class->focus = gtk_plug_focus;
58-
59-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
60--
61- container_class->check_resize = gtk_plug_check_resize;
62-
63- window_class->set_focus = gtk_plug_set_focus;
64-diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
65-index ffdaf8bee4..18b3d5563d 100644
66---- a/gtk/gtksocket.c
67-+++ b/gtk/gtksocket.c
68-@@ -271,7 +271,6 @@ gtk_socket_class_init (GtkSocketClass *class)
69- G_TYPE_BOOLEAN, 0);
70-
71-
72-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SOCKET_ACCESSIBLE);
73- }
74-
75- static void
76-@@ -1432,7 +1431,6 @@ _gtk_socket_accessible_embed (GtkWidget *socket, GdkWindow *window)
77- return;
78- }
79-
80-- gtk_socket_accessible_embed (GTK_SOCKET_ACCESSIBLE (gtk_widget_get_accessible (socket)), (gchar*) data);
81- XFree (data);
82-
83- return;
+2,
-4
1@@ -1,5 +1,3 @@
2 https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.tar.xz
3-patches/01-no-fribidi.patch
4-patches/02-fix-firefox.patch
5-patches/03-no-accessibility.patch
6-patches/04-no-atk-extra.patch
7+patches/0001-remove-fribidi-dependency.patch
8+patches/0002-remove-need-for-atk.patch