[glib: 5/5] Merge branch 'wip/hadess/power-profile-monitor-portal' into 'main'

[Philip Withnall <pwithnall src gnome org>]

commit d6a0e706f0dbf8338094c98f51e75556c78d6fbd
Merge: a380bfdf9 2e9842caf
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Aug 13 08:31:14 2021 +0000

    Merge branch 'wip/hadess/power-profile-monitor-portal' into 'main'
    
    gio: Add portal version of GPowerProfileMonitor
    
    See merge request GNOME/glib!2222

 docs/reference/gio/meson.build               |   1 +
 gio/giomodule.c                              |   2 +
 gio/gpowerprofilemonitorportal.c             | 182 +++++++++++++++++++++++++++
 gio/gpowerprofilemonitorportal.h             |  31 +++++
 gio/meson.build                              |   1 +
 gio/tests/memory-monitor-dbus.py.in          |  31 +++--
 gio/tests/memory-monitor-portal.py.in        |  32 +++--
 gio/tests/meson.build                        |  14 ++-
 gio/tests/power-profile-monitor-dbus.py.in   | 107 ++++++++++++++++
 gio/tests/power-profile-monitor-portal.py.in | 126 +++++++++++++++++++
 10 files changed, 496 insertions(+), 31 deletions(-)
---