[gnome-initial-setup: 1/2] password: Use malcontent symbolic icon for parent password

[Will Thompson <wjt src gnome org>]

commit 5a6553126ae10b73b761213664670a7fda83bd6b
Author: Philip Withnall <withnall endlessm com>
Date:   Tue Feb 25 14:29:56 2020 +0000

    password: Use malcontent symbolic icon for parent password
    
    This should make it fairly clear that the password is related to
    parental controls, rather than for a specific user account.
    
    This bumps our malcontent dependency to 0.6.0, as that’s the first
    release to contain the icon.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 .gitlab-ci.yml                                         | 2 +-
 gnome-initial-setup/pages/password/gis-password-page.c | 6 +-----
 meson.build                                            | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fc5e36..b294836 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ before_script:
     # so build it manually.
     - git clone https://gitlab.freedesktop.org/pwithnall/malcontent.git ./malcontent
     - pushd ./malcontent
-    - git checkout tags/0.5.0
+    - git checkout tags/0.6.0
     - meson setup ${MESON_COMMON_OPTIONS} --prefix /usr _build
     - ninja -C _build
     - sudo ninja -C _build install
diff --git a/gnome-initial-setup/pages/password/gis-password-page.c 
b/gnome-initial-setup/pages/password/gis-password-page.c
index 7ec7211..a45f2e2 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.c
+++ b/gnome-initial-setup/pages/password/gis-password-page.c
@@ -96,11 +96,7 @@ update_header (GisPasswordPage *page)
       /* Translators: The placeholder is the full name of the child user on the system. */
       subtitle = g_strdup_printf (_("This password will control access to the parental controls for %s."),
                                   gis_driver_get_full_name (GIS_PAGE (page)->driver));
-      /* FIXME: Use the malcontent icon once it’s available. See
-       *  * https://gitlab.freedesktop.org/pwithnall/malcontent/issues/9
-       *  * https://gitlab.gnome.org/GNOME/gnome-initial-setup/merge_requests/72#note_704634
-       */
-      icon_name = "dialog-password-symbolic";
+      icon_name = "org.freedesktop.MalcontentControl-symbolic";
       pixbuf = NULL;
     }
 #endif
diff --git a/meson.build b/meson.build
index a8d9c82..199c45a 100644
--- a/meson.build
+++ b/meson.build
@@ -70,10 +70,10 @@ conf.set('HAVE_IBUS', ibus_dep.found())
 
 # Needed for the parental controls pages
 libmalcontent_dep = dependency ('malcontent-0',
-                                version: '>= 0.5.0',
+                                version: '>= 0.6.0',
                                 required: get_option('parental_controls'))
 libmalcontent_ui_dep = dependency ('malcontent-ui-0',
-                                   version: '>= 0.5.0',
+                                   version: '>= 0.6.0',
                                    required: get_option('parental_controls'))
 conf.set('HAVE_PARENTAL_CONTROLS', libmalcontent_dep.found() and libmalcontent_ui_dep.found())