[glib: 2/2] Merge branch 'shorten-gdbus-test-filename' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 7db63898c14f7898b2c0300b5f719e97e8131483
Merge: 39afe07e2 180e59539
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Oct 23 09:16:58 2018 +0000

    Merge branch 'shorten-gdbus-test-filename' into 'master'
    
    build: work around meson issue with too long filenames on Windows. Fixes #1556
    
    Closes #1556
    
    See merge request GNOME/glib!370

 gio/.gitignore                                     |  6 +++---
 gio/tests/gdbus-example-objectmanager-client.c     |  2 +-
 gio/tests/gdbus-example-objectmanager-server.c     |  2 +-
 gio/tests/gdbus-object-manager-example/Makefile.am | 18 +++++++++---------
 gio/tests/gdbus-object-manager-example/meson.build | 14 +++++++-------
 gio/tests/gdbus-peer.c                             |  2 +-
 gio/tests/gdbus-test-fixture.c                     |  2 +-
 7 files changed, 23 insertions(+), 23 deletions(-)
---