[glib: 2/2] Merge branch '1035-bookmarks-state-machine' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 83c69fa77d53b2f60f5cf34e4d4156d9c90a06f7
Merge: dbf9959d1 376234f9b
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Jul 30 22:50:52 2018 +0000

    Merge branch '1035-bookmarks-state-machine' into 'master'
    
    gbookmarkfile: Fix error reporting with unexpected nesting of elements
    
    Closes #1035
    
    See merge request GNOME/glib!207

 glib/gbookmarkfile.c              | 60 ++++++++++++++++++++++++++++++++++++---
 glib/tests/Makefile.am            | 21 ++++++++++++++
 glib/tests/bookmarks/fail-18.xbel |  1 +
 glib/tests/bookmarks/fail-19.xbel |  1 +
 glib/tests/bookmarks/fail-20.xbel |  1 +
 glib/tests/bookmarks/fail-21.xbel |  1 +
 glib/tests/bookmarks/fail-22.xbel |  1 +
 glib/tests/bookmarks/fail-23.xbel |  1 +
 glib/tests/bookmarks/fail-24.xbel |  1 +
 glib/tests/bookmarks/fail-25.xbel |  1 +
 glib/tests/bookmarks/fail-26.xbel |  1 +
 glib/tests/bookmarks/fail-27.xbel |  1 +
 glib/tests/bookmarks/fail-28.xbel |  1 +
 glib/tests/bookmarks/fail-29.xbel |  1 +
 glib/tests/bookmarks/fail-30.xbel |  1 +
 glib/tests/bookmarks/fail-31.xbel |  1 +
 glib/tests/bookmarks/fail-32.xbel |  1 +
 glib/tests/bookmarks/fail-33.xbel |  1 +
 glib/tests/bookmarks/fail-34.xbel |  1 +
 glib/tests/bookmarks/fail-35.xbel |  1 +
 glib/tests/bookmarks/fail-36.xbel |  1 +
 glib/tests/bookmarks/fail-37.xbel |  1 +
 glib/tests/bookmarks/fail-38.xbel |  1 +
 23 files changed, 98 insertions(+), 4 deletions(-)
---