[gtk: 2/2] Merge branch 'avoid-mime-sniffing' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit f6b0e0e1c26d10d5717ede9cf8e1d3957849ad8b
Merge: 55b60f6da9 2f17ab3ce7
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Feb 8 15:44:16 2020 +0000

    Merge branch 'avoid-mime-sniffing' into 'master'
    
    Avoid mime sniffing where possible
    
    See merge request GNOME/gtk!1400

 gtk/gdkpixbufutilsprivate.h |  2 ++
 gtk/gtkcssimagerecolor.c    |  4 ++--
 gtk/tools/gdkpixbufutils.c  | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
---