[gnome-initial-setup/120-stop-autolaunching-gnome-tour] Remove logic to start Tour

[Marge Bot <marge-bot src gnome org>]

commit 2bf1bcaa81c8733665cc33be78652969dd07cd9e
Author: Will Thompson <wjt endlessos org>
Date:   Fri Jan 29 16:28:05 2021 +0000

    Remove logic to start Tour
    
    Previously, Initial Setup would arrange for Tour to be launched at the
    end of the setup process, unless disabled in the vendor configuration
    file.
    
    In GNOME 40, users will launch the tour themselves, either from a
    [welcome dialogue shown by the shell itself][0] or from [the tour's app
    launcher][1].
    
    Remove all logic related to launching the tour.
    
    [0]: https://gitlab.gnome.org/Teams/Design/os-mockups/-/issues/90
    [1]: https://gitlab.gnome.org/GNOME/gnome-tour/-/issues/28
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/merge_requests/111>

 README.md                                             |  5 -----
 data/gnome-initial-setup-first-login.service.in       |  3 ---
 data/gnome-welcome-tour                               | 13 -------------
 data/gnome-welcome-tour.desktop.in.in                 |  8 --------
 data/gnome-welcome-tour.service.in                    | 12 ------------
 data/meson.build                                      |  4 ----
 gnome-initial-setup/gnome-initial-setup-copy-worker.c |  1 -
 gnome-initial-setup/gnome-initial-setup.c             | 12 ------------
 8 files changed, 58 deletions(-)
---
diff --git a/README.md b/README.md
index aa13dbaf..eb125296 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,6 @@ in a 'first boot' situation. We are using gnome-shell in an 'initial-setup'
 mode that shows a somewhat reduced UI, similar to the way it is used on
 the login screen.
 
-We also want to offer the user a friendly way to learn more about GNOME,
-by taking a 'tour' after completing these setup tasks.
-
 The design for the initial-setup application can be found here:
 https://live.gnome.org/GnomeOS/Design/Whiteboards/InitialSetup
 
@@ -61,8 +58,6 @@ skip=timezone
 existing_user_only=language;keyboard
 # Only show the privacy page in the 'first boot' situation
 new_user_only=privacy
-# Don’t run the welcome tour once initial setup is complete
-run_welcome_tour=false
 
 [goa]
 # Offer a different set of GNOME Online Accounts providers on the Online
diff --git a/data/gnome-initial-setup-first-login.service.in b/data/gnome-initial-setup-first-login.service.in
index 940395ab..45e6c80f 100644
--- a/data/gnome-initial-setup-first-login.service.in
+++ b/data/gnome-initial-setup-first-login.service.in
@@ -4,9 +4,6 @@ Description=GNOME Initial Setup
 BindsTo=gnome-session.target
 After=gnome-session.target
 
-# Together with Type=oneshot, make sure the welcome tour starts after setup
-Before=gnome-welcome-tour.service
-
 # Never run in GDM
 Conflicts=gnome-session@gnome-login.target
 
diff --git a/data/meson.build b/data/meson.build
index d9cb2728..4e08adf6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,6 @@
 autostart_files = [
     'gnome-initial-setup-copy-worker.desktop',
     'gnome-initial-setup-first-login.desktop',
-    'gnome-welcome-tour.desktop'
 ]
 
 gis_shell_component = 'org.gnome.Shell'
@@ -67,7 +66,6 @@ if enable_systemd
     unit_files = {
         'gnome-initial-setup-first-login.service' : [ 'gnome-session.target.wants/' ],
         'gnome-initial-setup-copy-worker.service' : [ 'gnome-session.target.wants/' ],
-        'gnome-welcome-tour.service' : [ 'gnome-session.target.wants/' ],
     }
 
     foreach unit, wants: unit_files
@@ -123,5 +121,3 @@ configure_file(
 
 mode_dir = join_paths(data_dir, 'gnome-shell', 'modes')
 install_data('initial-setup.json', install_dir: mode_dir)
-
-install_data('gnome-welcome-tour', install_dir: get_option('libexecdir'))
diff --git a/gnome-initial-setup/gnome-initial-setup-copy-worker.c 
b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
index df071557..5d8bab05 100644
--- a/gnome-initial-setup/gnome-initial-setup-copy-worker.c
+++ b/gnome-initial-setup/gnome-initial-setup-copy-worker.c
@@ -89,7 +89,6 @@ main (int    argc,
   move_file_from_homedir (src, dest, path);
 
   FILE (".config/gnome-initial-setup-done");
-  FILE (".config/run-welcome-tour");
   FILE (".config/dconf/user");
   FILE (".config/goa-1.0/accounts.conf");
   FILE (".config/monitors.xml");
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 0ab987af..303b1da4 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -48,7 +48,6 @@
 #define VENDOR_SKIP_KEY "skip"
 #define VENDOR_NEW_USER_ONLY_KEY "new_user_only"
 #define VENDOR_EXISTING_USER_ONLY_KEY "existing_user_only"
-#define VENDOR_RUN_WELCOME_TOUR_KEY "run_welcome_tour"
 
 static gboolean force_existing_user_mode;
 
@@ -334,17 +333,6 @@ gis_ensure_stamp_files (GisDriver *driver)
   g_autofree gchar *done_file = NULL;
   g_autoptr(GError) error = NULL;
 
-  if (gis_driver_conf_get_boolean (driver,
-                                   VENDOR_PAGES_GROUP,
-                                   VENDOR_RUN_WELCOME_TOUR_KEY,
-                                   TRUE)) {
-      welcome_file = g_build_filename (g_get_user_config_dir (), "run-welcome-tour", NULL);
-      if (!g_file_set_contents (welcome_file, "yes", -1, &error)) {
-          g_warning ("Unable to create %s: %s", welcome_file, error->message);
-          g_clear_error (&error);
-      }
-  }
-
   done_file = g_build_filename (g_get_user_config_dir (), "gnome-initial-setup-done", NULL);
   if (!g_file_set_contents (done_file, "yes", -1, &error)) {
       g_warning ("Unable to create %s: %s", done_file, error->message);