From 33ca18287c74aab91866c448083da08bed6b64d2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 19 Sep 2023 19:55:56 -0400 Subject: [PATCH] Fix failure from bug in back button patch --- live-user-mode.patch | 108 +++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 46 deletions(-) diff --git a/live-user-mode.patch b/live-user-mode.patch index e08ceb6..d849e60 100644 --- a/live-user-mode.patch +++ b/live-user-mode.patch @@ -1,4 +1,4 @@ -From e51d40084fe304ba78404354e9aed00396954bdd Mon Sep 17 00:00:00 2001 +From 0e875c6e060147a1357dcc5ef90534786adb6a53 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 15 Aug 2023 10:53:41 -0400 Subject: [PATCH 01/10] gnome-initial-setup: Bump GLib required version to 2.76 @@ -38,10 +38,10 @@ index 2e40a2e2..fba4d96a 100644 enable_systemd = get_option('systemd') if enable_systemd -- -GitLab +2.41.0 -From b729f698befddefb9618aa8399ade5306486dd9f Mon Sep 17 00:00:00 2001 +From 94c458dd6d8a2081884bfdc62a4405933b4bf3f6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sat, 9 Sep 2023 17:07:46 -0400 Subject: [PATCH 02/10] keyboard: Don't require localed for existing user mode @@ -76,10 +76,10 @@ index fa41230f..da384495 100644 } -- -GitLab +2.41.0 -From 2f5bf8a8203c0b12937c8be0fb536dd8f28f2fca Mon Sep 17 00:00:00 2001 +From 73fe1db72017c1be6346525c2b68cf109d31effe Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 8 Sep 2023 11:02:39 -0400 Subject: [PATCH 03/10] language: Don't proceed until localed has set locale @@ -165,10 +165,10 @@ index 87b9f2d8..26a01257 100644 } -- -GitLab +2.41.0 -From 4ac881f55d46bc45e09a831aa5ab9ae2ba173477 Mon Sep 17 00:00:00 2001 +From e020f546a68101f2691190bdfb2d396da79b8ae0 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 24 Aug 2023 21:19:40 -0400 Subject: [PATCH 04/10] keyboard: Get default input sources from gnome-desktop @@ -779,10 +779,10 @@ index da384495..f2bfe164 100644 if (gis_driver_get_mode (GIS_PAGE (self)->driver) == GIS_DRIVER_MODE_NEW_USER) priv->permission = polkit_permission_new_sync ("org.freedesktop.locale1.set-keyboard", NULL, NULL, NULL); -- -GitLab +2.41.0 -From b67c0d9a551891e88b969981d8cfcaa36eb8fed2 Mon Sep 17 00:00:00 2001 +From 7fa6c5e1a2152e65d4935f6f9bed0e419ff61a64 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 13 Aug 2023 09:09:56 -0400 Subject: [PATCH 05/10] driver: Specify mode via flags instead of boolean @@ -1071,10 +1071,10 @@ index 113ded36..59955779 100644 skipped = TRUE; -- -GitLab +2.41.0 -From 5d02f9f885d370e587f5620d03820cce4118d340 Mon Sep 17 00:00:00 2001 +From 1f5bb5b4cc7d2e9a1933f0665172ccd88d2962f2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 30 Aug 2023 15:08:23 -0400 Subject: [PATCH 06/10] assistant: Show Back button on summary page @@ -1092,9 +1092,9 @@ bunch of pages the user could potentially want to revisit. This commit shows the back button on the last page (either the summary page or the install page). --- - gnome-initial-setup/gis-assistant.c | 14 +++++++++----- - .../pages/summary/gis-summary-page.c | 16 +++++++++------- - 2 files changed, 18 insertions(+), 12 deletions(-) + gnome-initial-setup/gis-assistant.c | 14 ++++++---- + .../pages/summary/gis-summary-page.c | 26 ++++++++++--------- + 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/gnome-initial-setup/gis-assistant.c b/gnome-initial-setup/gis-assistant.c index a3122b71..8a7fc52b 100644 @@ -1156,13 +1156,14 @@ index a3122b71..8a7fc52b 100644 { if (!gis_page_save_data (l->data, error)) diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c -index 0aee2dad..8a526b64 100644 +index 0aee2dad..85de7060 100644 --- a/gnome-initial-setup/pages/summary/gis-summary-page.c +++ b/gnome-initial-setup/pages/summary/gis-summary-page.c -@@ -180,6 +180,15 @@ log_user_in (GisSummaryPage *page) +@@ -180,6 +180,20 @@ log_user_in (GisSummaryPage *page) static void done_cb (GtkButton *button, GisSummaryPage *page) { ++ GisSummaryPagePrivate *priv = gis_summary_page_get_instance_private (page); + g_autoptr (GError) error = NULL; + + if (!gis_driver_save_data (GIS_PAGE (page)->driver, &error)) @@ -1171,14 +1172,20 @@ index 0aee2dad..8a526b64 100644 + * provided to them. */ + g_warning ("Error saving data: %s", error->message); + } ++ ++ gis_driver_get_user_permissions (GIS_PAGE (page)->driver, ++ &priv->user_account, ++ &priv->user_password); + gis_ensure_stamp_files (GIS_PAGE (page)->driver); switch (gis_driver_get_mode (GIS_PAGE (page)->driver)) -@@ -202,13 +211,6 @@ gis_summary_page_shown (GisPage *page) +@@ -200,18 +214,6 @@ gis_summary_page_shown (GisPage *page) + { + GisSummaryPage *summary = GIS_SUMMARY_PAGE (page); GisSummaryPagePrivate *priv = gis_summary_page_get_instance_private (summary); - g_autoptr(GError) local_error = NULL; - +- g_autoptr(GError) local_error = NULL; +- - if (!gis_driver_save_data (GIS_PAGE (page)->driver, &local_error)) - { - /* FIXME: This should probably be shown to the user and some options @@ -1186,14 +1193,17 @@ index 0aee2dad..8a526b64 100644 - g_warning ("Error saving data: %s", local_error->message); - } - - gis_driver_get_user_permissions (GIS_PAGE (page)->driver, - &priv->user_account, - &priv->user_password); +- gis_driver_get_user_permissions (GIS_PAGE (page)->driver, +- &priv->user_account, +- &priv->user_password); + + gtk_widget_grab_focus (priv->start_button); + } -- -GitLab +2.41.0 -From af751585cd5d124e7de19ab9e1b08d4cd925c6c3 Mon Sep 17 00:00:00 2001 +From eb0ed3cf845fd47f24edc01bda5456bd73cea319 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Sun, 13 Aug 2023 09:39:07 -0400 Subject: [PATCH 07/10] gnome-initial-setup: Add live user mode @@ -1212,7 +1222,7 @@ or just jump into the live session instead. gnome-initial-setup/gis-util.h | 4 + gnome-initial-setup/gnome-initial-setup.c | 26 +- .../pages/account/gis-account-pages.c | 21 + - .../pages/install/gis-install-page.c | 382 ++++++++++++++++++ + .../pages/install/gis-install-page.c | 388 ++++++++++++++++++ .../pages/install/gis-install-page.css | 11 + .../pages/install/gis-install-page.h | 52 +++ .../pages/install/gis-install-page.ui | 51 +++ @@ -1222,7 +1232,7 @@ or just jump into the live session instead. .../pages/language/gis-language-page.c | 5 +- gnome-initial-setup/pages/meson.build | 1 + .../pages/password/gis-password-page.c | 6 + - 17 files changed, 701 insertions(+), 18 deletions(-) + 17 files changed, 707 insertions(+), 18 deletions(-) create mode 100644 gnome-initial-setup/pages/install/gis-install-page.c create mode 100644 gnome-initial-setup/pages/install/gis-install-page.css create mode 100644 gnome-initial-setup/pages/install/gis-install-page.h @@ -1551,10 +1561,10 @@ index d9cc8d9f..8b0d8e99 100644 NULL); diff --git a/gnome-initial-setup/pages/install/gis-install-page.c b/gnome-initial-setup/pages/install/gis-install-page.c new file mode 100644 -index 00000000..36ed7539 +index 00000000..0b816ee5 --- /dev/null +++ b/gnome-initial-setup/pages/install/gis-install-page.c -@@ -0,0 +1,382 @@ +@@ -0,0 +1,388 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* + * Copyright (C) 2023 Red Hat @@ -1714,18 +1724,28 @@ index 00000000..36ed7539 +} + +static void -+on_try_button_clicked (GtkButton *button, -+ GisInstallPage *page) ++hide_and_save (GisInstallPage *page) +{ -+ ++ GisInstallPagePrivate *priv = gis_install_page_get_instance_private (page); + g_autoptr (GError) error = NULL; + ++ gis_driver_hide_window (GIS_PAGE (page)->driver); ++ + if (!gis_driver_save_data (GIS_PAGE (page)->driver, &error)) + g_warning ("Error saving data: %s", error->message); + -+ gis_ensure_stamp_files (GIS_PAGE (page)->driver); ++ gis_driver_get_user_permissions (GIS_PAGE (page)->driver, ++ &priv->user_account, ++ &priv->user_password); + -+ gis_driver_hide_window (GIS_PAGE (page)->driver); ++ gis_ensure_stamp_files (GIS_PAGE (page)->driver); ++} ++ ++static void ++on_try_button_clicked (GtkButton *button, ++ GisInstallPage *page) ++{ ++ hide_and_save (page); + log_user_in (page); +} + @@ -1807,7 +1827,7 @@ index 00000000..36ed7539 +on_install_button_clicked (GtkButton *button, + GisInstallPage *page) +{ -+ gis_driver_hide_window (GIS_PAGE (page)->driver); ++ hide_and_save (page); + run_installer (page); +} + @@ -1818,10 +1838,6 @@ index 00000000..36ed7539 + GisInstallPagePrivate *priv = gis_install_page_get_instance_private (install); + g_autoptr(GError) local_error = NULL; + -+ gis_driver_get_user_permissions (GIS_PAGE (page)->driver, -+ &priv->user_account, -+ &priv->user_password); -+ + gtk_widget_grab_focus (priv->install_button); +} + @@ -2056,7 +2072,7 @@ index 00000000..c9ed5c88 + + + -+ Install to Disk… ++ Install to Disk… +