[gnome-initial-setup/shell/4765: 323/362] Make sure that tutorial is shown to both new and existing users

[Jasper St. Pierre <jstpierre src gnome org>]

commit daa0802727c62212683a5ec61caa9b72e89c73e5
Author: Srdjan Grubor <sgnn7 sgnn7 org>
Date:   Mon Jan 5 16:52:18 2015 -0600

    Make sure that tutorial is shown to both new and existing users
    
    Now even if the user is an existing one, we show the tutorial at the end
    of the summary.

 .../pages/summary/gis-summary-page.c               |   22 +++++++++++++++----
 1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c 
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 0c103e8..182e420 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -236,7 +236,16 @@ play_tutorial_ready_callback (GObject *fbe_remote,
       g_error_free (error);
     }
 
-  log_user_in (summary);
+  /* Either log user in or quit the app depending on if the user is new */
+  switch (gis_driver_get_mode (GIS_PAGE (summary)->driver))
+    {
+    case GIS_DRIVER_MODE_NEW_USER:
+      log_user_in (summary);
+      break;
+    case GIS_DRIVER_MODE_EXISTING_USER:
+      g_application_quit (G_APPLICATION (GIS_PAGE (summary)->driver));
+      break;
+    }
 }
 
 static void
@@ -256,7 +265,11 @@ launch_tutorial (GisSummaryPage *summary)
       g_critical ("Could not get DBus proxy for tutorial FBE remote: %s\n", error->message);
       g_error_free (error);
 
-      log_user_in (summary);
+      if (gis_driver_get_mode (GIS_PAGE (summary)->driver) == GIS_DRIVER_MODE_NEW_USER)
+        {
+          log_user_in (summary);
+        }
+
       return;
     }
 
@@ -278,14 +291,13 @@ done_cb (GtkButton *button, GisSummaryPage *page)
     {
     case GIS_DRIVER_MODE_NEW_USER:
       gis_driver_hide_window (GIS_PAGE (page)->driver);
-      launch_tutorial (page);
       break;
     case GIS_DRIVER_MODE_EXISTING_USER:
       gis_add_setup_done_file ();
-      g_application_quit (G_APPLICATION (GIS_PAGE (page)->driver));
-    default:
       break;
     }
+
+    launch_tutorial (page);
 }
 
 static void