[glib: 2/2] Merge branch 'issue-699' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 6dc543c6d3e9226ffbc6c21f4f287a6329b48a3f
Merge: 2fe4fa6cd 7e5db31d3
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jun 14 17:27:30 2018 +0000

    Merge branch 'issue-699' into 'master'
    
    Deprecate g_type_class_add_private()
    
    Closes #699
    
    See merge request GNOME/glib!7

 gobject/gtype.c             |  4 +++-
 gobject/gtype.h             |  4 +++-
 gobject/tests/private.c     |  2 ++
 tests/gobject/testgobject.c | 38 +++++++++++++++++++++++++-------------
 4 files changed, 33 insertions(+), 15 deletions(-)
---