[rhythmbox: 4/4] Merge branch 'wip/hadess/remove-media-keys' into 'master'

[Jonathan Matthew <jmatthew src gnome org>]

commit d0154eb34a1ee033f56f10b1c722b7e96184d860
Merge: 9e0f1a1c6 0cdeb7cb7
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jan 18 21:24:35 2022 +0000

    Merge branch 'wip/hadess/remove-media-keys' into 'master'
    
    mmkeys: Remove gnome-settings-daemon MediaKeys plugin
    
    See merge request GNOME/rhythmbox!132

 .gitlab-ci.yml                          |   1 -
 meson.build                             |  10 +-
 meson_options.txt                       |   2 -
 plugins/meson.build                     |   1 -
 plugins/mmkeys/meson.build              |  19 --
 plugins/mmkeys/mmkeys.plugin.desktop.in |   9 -
 plugins/mmkeys/rb-mmkeys-plugin.c       | 480 --------------------------------
 plugins/mpris/mpris.plugin.desktop.in   |   1 +
 8 files changed, 2 insertions(+), 521 deletions(-)
---
diff --cc meson.build
index 78e81005c,4998389d8..1336d72e3
--- a/meson.build
+++ b/meson.build
@@@ -256,10 -265,11 +249,9 @@@ configure_file(input : 'config.h.meson'
    output : 'config.h',
  configuration : cdata)
  
 -summary({'Database': get_option('database'),
 -         'Coherence check level': get_option('rhythmdb_debug'),
 -         'Tests': enable_check},
 +summary({'Tests': enable_check},
          section: 'General')
- summary({'Multimedia keys': enable_mmkeys,
-          'iPod integration': use_ipod,
+ summary({'iPod integration': use_ipod,
           'MTP integration': use_mtp,
           'CD burning support': have_libbrasero_media,
           'DAAP (music sharing) support': have_libdmapsharing,