[gnome-initial-setup/youre-welcome: 6/6] Only show welcome if language is skipped

[Philip Withnall <pwithnall src gnome org>]

commit f3b5f6e655914a4dec5768935d7c8523d512b334
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Aug 6 08:57:50 2020 -0400

    Only show welcome if language is skipped
    
    When language selection is needed, we want it to be
    the first page the user sees, since he may not be able
    to read anything before selecting the language.
    
    So, skip the welcome page unless language is skipped.

 gnome-initial-setup/gnome-initial-setup.c | 7 +++++++
 1 file changed, 7 insertions(+)
---
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 7a826dba..6aa018f5 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -89,6 +89,12 @@ should_skip_page (const gchar  *page_id,
 {
   guint i = 0;
 
+  /* special case welcome. We only want to show it if language
+   * is skipped
+   */
+  if (strcmp (page_id, "welcome") == 0)
+    return !should_skip_page ("language", skip_pages);
+
   /* check through our skip pages list for pages we don't want */
   if (skip_pages) {
     while (skip_pages[i]) {
@@ -97,6 +103,7 @@ should_skip_page (const gchar  *page_id,
       i++;
     }
   }
+
   return FALSE;
 }