[gtk: 5/5] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 897164c66cd8b7ad15dc5e234e1a7c34688dae5b
Merge: d5ef906cff 441d944c08
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jan 9 03:56:59 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    Closes #3565
    
    See merge request GNOME/gtk!3061

 gtk/gtkdroptarget.c            | 24 +++++++++++-------------
 gtk/gtksecurememoryprivate.h   |  1 +
 gtk/gtktestatcontext.h         | 30 +++++++++++++++---------------
 modules/media/gtkffmediafile.c |  2 +-
 testsuite/gtk/object.c         |  4 ++--
 5 files changed, 30 insertions(+), 31 deletions(-)
---