[gnome-initial-setup/wip/pwithnall/misc-fixes: 60/70] Show all pages in persistent live mode

[Philip Withnall <pwithnall src gnome org>]

commit 20a8fa5a0401ce6f1d248940a8d855cb942b5c9a
Author: Daniel Drake <drake endlessm com>
Date:   Fri Oct 4 11:47:18 2019 +0800

    Show all pages in persistent live mode
    
    In persistent live mode, we'll store the users account, settings, etc,
    so we should show all of the usual pages of the first boot experience.
    
    (Rebase 3.38: Fix minor rebase conflicts.)
    
    https://phabricator.endlessm.com/T27772

 gnome-initial-setup/pages/account/gis-account-pages.c  | 3 ++-
 gnome-initial-setup/pages/goa/gis-goa-page.c           | 3 ++-
 gnome-initial-setup/pages/password/gis-password-page.c | 3 ++-
 gnome-initial-setup/pages/site/gis-site-page.c         | 3 ++-
 gnome-initial-setup/pages/timezone/gis-timezone-page.c | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-pages.c 
b/gnome-initial-setup/pages/account/gis-account-pages.c
index 7f117375..3cd429d9 100644
--- a/gnome-initial-setup/pages/account/gis-account-pages.c
+++ b/gnome-initial-setup/pages/account/gis-account-pages.c
@@ -26,7 +26,8 @@
 GisPage *
 gis_prepare_account_page (GisDriver *driver)
 {
-  if (gis_driver_is_live_session (driver))
+  if (gis_driver_is_live_session (driver) &&
+      !gis_driver_has_live_persistence (driver))
     return NULL;
 
   return g_object_new (GIS_TYPE_ACCOUNT_PAGE,
diff --git a/gnome-initial-setup/pages/goa/gis-goa-page.c b/gnome-initial-setup/pages/goa/gis-goa-page.c
index fa419d62..1b0ce705 100644
--- a/gnome-initial-setup/pages/goa/gis-goa-page.c
+++ b/gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -385,7 +385,8 @@ gis_goa_page_init (GisGoaPage *page)
 GisPage *
 gis_prepare_goa_page (GisDriver *driver)
 {
-  if (gis_driver_is_live_session (driver))
+  if (gis_driver_is_live_session (driver) &&
+      !gis_driver_has_live_persistence (driver))
     return NULL;
 
   return g_object_new (GIS_TYPE_GOA_PAGE,
diff --git a/gnome-initial-setup/pages/password/gis-password-page.c 
b/gnome-initial-setup/pages/password/gis-password-page.c
index c5fac592..cf2f3705 100644
--- a/gnome-initial-setup/pages/password/gis-password-page.c
+++ b/gnome-initial-setup/pages/password/gis-password-page.c
@@ -617,7 +617,8 @@ gis_password_page_init (GisPasswordPage *page)
 GisPage *
 gis_prepare_password_page (GisDriver *driver)
 {
-  if (gis_driver_is_live_session (driver))
+  if (gis_driver_is_live_session (driver) &&
+      !gis_driver_has_live_persistence (driver))
     return NULL;
 
   return g_object_new (GIS_TYPE_PASSWORD_PAGE,
diff --git a/gnome-initial-setup/pages/site/gis-site-page.c b/gnome-initial-setup/pages/site/gis-site-page.c
index 2d0ec228..9a647244 100644
--- a/gnome-initial-setup/pages/site/gis-site-page.c
+++ b/gnome-initial-setup/pages/site/gis-site-page.c
@@ -460,7 +460,8 @@ gis_site_page_init (GisSitePage *page)
 GisPage *
 gis_prepare_site_page (GisDriver *driver)
 {
-  if (gis_driver_is_live_session (driver))
+  if (gis_driver_is_live_session (driver) &&
+      !gis_driver_has_live_persistence (driver))
     return NULL;
 
   return g_object_new (GIS_TYPE_SITE_PAGE,
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c 
b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index ba7683ce..1e0e44f0 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -541,7 +541,8 @@ gis_timezone_page_init (GisTimezonePage *page)
 GisPage *
 gis_prepare_timezone_page (GisDriver *driver)
 {
-  if (gis_driver_is_live_session (driver))
+  if (gis_driver_is_live_session (driver) &&
+      !gis_driver_has_live_persistence (driver))
     return NULL;
 
   return g_object_new (GIS_TYPE_TIMEZONE_PAGE,