[glib: 3/3] Merge branch '1190-debug-interface' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit 7f519624e2d654e14471b930acd984eab1179322
Merge: 13ee46538 0c8f7de55
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Jan 27 11:00:40 2022 +0000

    Merge branch '1190-debug-interface' into 'main'
    
    gdebugcontroller: Add debug controller API and D-Bus implementation
    
    Closes #1190
    
    See merge request GNOME/glib!2330

 docs/reference/gio/gio-docs.xml            |   2 +
 docs/reference/gio/gio-sections-common.txt |  30 ++
 docs/reference/glib/glib-sections.txt      |   2 +
 gio/gdebugcontroller.c                     | 132 ++++++++
 gio/gdebugcontroller.h                     |  82 +++++
 gio/gdebugcontrollerdbus.c                 | 490 +++++++++++++++++++++++++++++
 gio/gdebugcontrollerdbus.h                 |  66 ++++
 gio/gio.h                                  |   2 +
 gio/giomodule.c                            |   6 +
 gio/meson.build                            |   4 +
 glib/gmessages.c                           |  46 ++-
 glib/gmessages.h                           |   6 +
 po/POTFILES.in                             |   1 +
 13 files changed, 868 insertions(+), 1 deletion(-)
---
diff --cc gio/giomodule.c
index 1e202d3ee,3b80b9029..e727b83bc
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@@ -1082,9 -1080,9 +1084,10 @@@ extern GType _g_network_monitor_netlink
  extern GType _g_network_monitor_nm_get_type (void);
  #endif
  
+ extern GType g_debug_controller_dbus_get_type (void);
  extern GType g_memory_monitor_dbus_get_type (void);
  extern GType g_memory_monitor_portal_get_type (void);
 +extern GType g_memory_monitor_win32_get_type (void);
  extern GType g_power_profile_monitor_dbus_get_type (void);
  
  #ifdef G_OS_UNIX