[glib: 7/7] Merge branch 'fix_more_warnings' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit 55d18fd3dcd168c6c771558d12ffca54650f9000
Merge: 7c217b1c6 4d1f76ec5
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu Apr 15 07:24:57 2021 +0000

    Merge branch 'fix_more_warnings' into 'master'
    
    Fix more warnings
    
    See merge request GNOME/glib!2040

 gio/tests/gdbus-connection.c   |  3 ++-
 gio/tests/gdbus-export.c       | 16 +++++++++++-----
 gio/tests/gdbus-test-codegen.c |  4 ++--
 gio/tests/socket.c             |  3 ++-
 gio/tests/testfilemonitor.c    |  7 ++++---
 glib/gstring.c                 |  2 +-
 6 files changed, 22 insertions(+), 13 deletions(-)
---