[gtk: 2/2] Merge branch 'fix-textchild-abi' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit ae92181d02803d60a843e010fc7eb9655505ec4b
Merge: 5371e4403e 66910ed998
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Dec 11 16:32:45 2021 +0000

    Merge branch 'fix-textchild-abi' into 'main'
    
    Restore the GtkTextchild abi
    
    Closes #4531
    
    See merge request GNOME/gtk!4236

 gtk/gtktextbtree.c        | 130 ++++++++++++++---------------
 gtk/gtktextchild.c        |  43 +++++++---
 gtk/gtktextchild.h        |   1 -
 gtk/gtktextchildprivate.h |   2 +
 gtk/gtktextiter.c         | 202 +++++++++++++++++++++++-----------------------
 gtk/gtktextlayout.c       | 190 +++++++++++++++++++++----------------------
 6 files changed, 293 insertions(+), 275 deletions(-)
---