Merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

[Andrea Azzarone]

Drop ubuntu-changes page.

[Didier Roche-Tolomelli (didrocks)]

LGTM and builds fine! Thanks :)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 14b234b..5faa898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-initial-setup (3.29.92-1ubuntu3) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+    Drop ubuntu-changes page (LP: #1790146).
+
+ -- Andrea Azzarone <[e-mail]>  Thu, 20 Sep 2018 13:38:11 +0000
+
 gnome-initial-setup (3.29.92-1ubuntu2) cosmic; urgency=medium
 
   * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index 01953c3..f39b104 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -3,18 +3,18 @@ Date: Tue, 20 Mar 2018 11:51:30 +1300
 Subject: Add Ubuntu mode with special pages
 
 ---
- configure.ac                                       |   9 +-
+ configure.ac                                       |   8 +-
  data/Makefile.am                                   |   8 +
  data/com.ubuntu.welcome.policy.in                  |  21 +
  data/its/polkit.its                                |   8 +
  data/its/polkit.loc                                |   6 +
  data/meson.build                                   |  23 +
- gnome-initial-setup/Makefile.am                    |   4 +
+ gnome-initial-setup/Makefile.am                    |   3 +
  gnome-initial-setup/gis-driver.c                   |  35 ++
  gnome-initial-setup/gis-driver.h                   |   6 +
- gnome-initial-setup/gnome-initial-setup.c          |  42 +-
+ gnome-initial-setup/gnome-initial-setup.c          |  40 +-
  gnome-initial-setup/meson.build                    |   3 +
- gnome-initial-setup/pages/Makefile.am              |   8 +-
+ gnome-initial-setup/pages/Makefile.am              |   5 +-
  gnome-initial-setup/pages/apps/Makefile.am         |  23 +
  gnome-initial-setup/pages/apps/apps.gresource.xml  |   8 +
  .../pages/apps/default-snap-icon.svg               |   1 +
@@ -32,16 +32,9 @@ Subject: Add Ubuntu mode with special pages
  .../pages/livepatch/livepatch.gresource.xml        |   9 +
  gnome-initial-setup/pages/livepatch/livepatch.svg  |   1 +
  gnome-initial-setup/pages/livepatch/meson.build    |  12 +
- gnome-initial-setup/pages/meson.build              |   6 +-
+ gnome-initial-setup/pages/meson.build              |   5 +-
  .../pages/privacy/gis-privacy-page.c               |   2 +-
  .../pages/summary/gis-summary-page.c               |   2 +-
- .../pages/ubuntu-changes/Makefile.am               |  23 +
- .../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 175 +++++++
- .../pages/ubuntu-changes/gis-ubuntu-changes-page.h |  52 ++
- .../ubuntu-changes/gis-ubuntu-changes-page.ui      | 118 +++++
- .../pages/ubuntu-changes/meson.build               |  10 +
- .../ubuntu-changes/ubuntu-changes.gresource.xml    |   8 +
- .../pages/ubuntu-changes/ubuntu-changes.png        | Bin 0 -> 183653 bytes
  .../pages/ubuntu-report/Makefile.am                |  23 +
  .../pages/ubuntu-report/gis-ubuntu-report-page.c   | 241 ++++++++++
  .../pages/ubuntu-report/gis-ubuntu-report-page.h   |  52 ++
@@ -50,8 +43,8 @@ Subject: Add Ubuntu mode with special pages
  .../ubuntu-report/ubuntu-report.gresource.xml      |   8 +
  .../pages/ubuntu-report/ubuntu-report.svg          |   1 +
  meson.build                                        |   3 +
- po/POTFILES.in                                     |  14 +
- 48 files changed, 3398 insertions(+), 8 deletions(-)
+ po/POTFILES.in                                     |  12 +
+ 41 files changed, 3003 insertions(+), 7 deletions(-)
  create mode 100644 data/com.ubuntu.welcome.policy.in
  create mode 100644 data/its/polkit.its
  create mode 100644 data/its/polkit.loc
@@ -72,13 +65,6 @@ Subject: Add Ubuntu mode with special pages
  create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.gresource.xml
  create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.svg
  create mode 100644 gnome-initial-setup/pages/livepatch/meson.build
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/Makefile.am
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.ui
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/meson.build
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.gresource.xml
- create mode 100644 gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.png
  create mode 100644 gnome-initial-setup/pages/ubuntu-report/Makefile.am
  create mode 100644 gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.c
  create mode 100644 gnome-initial-setup/pages/ubuntu-report/gis-ubuntu-report-page.h
@@ -88,7 +74,7 @@ Subject: Add Ubuntu mode with special pages
  create mode 100644 gnome-initial-setup/pages/ubuntu-report/ubuntu-report.svg
 
 diff --git a/configure.ac b/configure.ac
-index 8175f06..baacd1c 100644
+index e028226..1aa25b6 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -59,7 +59,10 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
@@ -103,13 +89,12 @@ index 8175f06..baacd1c 100644
  
  INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
  INITIAL_SETUP_CFLAGS="$INITIAL_SETUP_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
-@@ -149,6 +152,10 @@ gnome-initial-setup/pages/account/Makefile
+@@ -149,6 +152,9 @@ gnome-initial-setup/pages/account/Makefile
  gnome-initial-setup/pages/password/Makefile
  gnome-initial-setup/pages/software/Makefile
  gnome-initial-setup/pages/summary/Makefile
 +gnome-initial-setup/pages/ubuntu-report/Makefile
 +gnome-initial-setup/pages/livepatch/Makefile
-+gnome-initial-setup/pages/ubuntu-changes/Makefile
 +gnome-initial-setup/pages/apps/Makefile
  po/Makefile.in
  ])
@@ -238,16 +223,15 @@ index ac14976..84f517a 100644
  install_data('20-gnome-initial-setup.rules', install_dir: rules_dir)
  
 diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
-index 6b6d5fb..7c8ca30 100644
+index 6b6d5fb..d8640a9 100644
 --- a/gnome-initial-setup/Makefile.am
 +++ b/gnome-initial-setup/Makefile.am
-@@ -44,6 +44,10 @@ gnome_initial_setup_LDADD =	\
+@@ -44,6 +44,9 @@ gnome_initial_setup_LDADD =	\
  	pages/password/libgispassword.la \
  	pages/software/libgissoftware.la \
  	pages/summary/libgissummary.la \
 +	pages/ubuntu-report/libgisubuntu-report.la \
 +	pages/livepatch/libgislivepatch.la \
-+	pages/ubuntu-changes/libgisubuntu-changes.la \
 +	pages/apps/libgisapps.la \
  	$(INITIAL_SETUP_LIBS) \
  	-lm
@@ -323,26 +307,24 @@ index 9eb408e..c5261fa 100644
  
  G_END_DECLS
 diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
-index bfcc03c..8755875 100644
+index bfcc03c..2676e1d 100644
 --- a/gnome-initial-setup/gnome-initial-setup.c
 +++ b/gnome-initial-setup/gnome-initial-setup.c
-@@ -44,6 +44,10 @@
+@@ -44,6 +44,9 @@
  #include "pages/account/gis-account-pages.h"
  #include "pages/password/gis-password-page.h"
  #include "pages/summary/gis-summary-page.h"
 +#include "pages/ubuntu-report/gis-ubuntu-report-page.h"
 +#include "pages/livepatch/gis-livepatch-page.h"
-+#include "pages/ubuntu-changes/gis-ubuntu-changes-page.h"
 +#include "pages/apps/gis-apps-page.h"
  
  #define VENDOR_PAGES_GROUP "pages"
  #define VENDOR_SKIP_KEY "skip"
-@@ -82,6 +86,17 @@ static PageData page_table[] = {
+@@ -82,6 +85,16 @@ static PageData page_table[] = {
    { NULL },
  };
  
 +static PageData ubuntu_page_table[] = {
-+  PAGE (ubuntu_changes, FALSE),
 +  PAGE (goa,            FALSE),
 +  PAGE (livepatch,      FALSE),
 +  PAGE (ubuntu_report,  FALSE),
@@ -355,7 +337,7 @@ index bfcc03c..8755875 100644
  #undef PAGE
  
  static gboolean
-@@ -188,6 +203,25 @@ destroy_pages_after (GisAssistant *assistant,
+@@ -188,6 +201,25 @@ destroy_pages_after (GisAssistant *assistant,
    }
  }
  
@@ -381,7 +363,7 @@ index bfcc03c..8755875 100644
  static void
  rebuild_pages_cb (GisDriver *driver)
  {
-@@ -200,7 +234,11 @@ rebuild_pages_cb (GisDriver *driver)
+@@ -200,7 +232,11 @@ rebuild_pages_cb (GisDriver *driver)
  
    assistant = gis_driver_get_assistant (driver);
    current_page = gis_assistant_get_current_page (assistant);
@@ -394,7 +376,7 @@ index bfcc03c..8755875 100644
  
    g_ptr_array_free (skipped_pages, TRUE);
    skipped_pages = g_ptr_array_new_with_free_func ((GDestroyNotify) gtk_widget_destroy);
-@@ -208,7 +246,7 @@ rebuild_pages_cb (GisDriver *driver)
+@@ -208,7 +244,7 @@ rebuild_pages_cb (GisDriver *driver)
    if (current_page != NULL) {
      destroy_pages_after (assistant, current_page);
  
@@ -418,10 +400,10 @@ index c461562..6bc8df9 100644
      cheese_gtk_dep,
      pkgkit_dep,
 diff --git a/gnome-initial-setup/pages/Makefile.am b/gnome-initial-setup/pages/Makefile.am
-index 4ddf574..df484db 100644
+index 4ddf574..0928dd2 100644
 --- a/gnome-initial-setup/pages/Makefile.am
 +++ b/gnome-initial-setup/pages/Makefile.am
-@@ -11,8 +11,12 @@ SUBDIRS = \
+@@ -11,7 +11,10 @@ SUBDIRS = \
  	account \
  	password \
  	summary \
@@ -429,14 +411,10 @@ index 4ddf574..df484db 100644
 +	software \
 +	ubuntu-report \
 +	livepatch \
-+	ubuntu-changes \
 +	apps
  
  EXTRA_DIST =		\
  	meson.build	\
--	$(NULL)
-+	$(NULL)
-\ No newline at end of file
 diff --git a/gnome-initial-setup/pages/apps/Makefile.am b/gnome-initial-setup/pages/apps/Makefile.am
 new file mode 100644
 index 0000000..a3d8992
@@ -2047,7 +2025,7 @@ index 0000000..2f3c742
 +</interface>
 diff --git a/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
 new file mode 100644
-index 0000000..4ef7d2e
+index 0000000..e604819
 --- /dev/null
 +++ b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
 @@ -0,0 +1,533 @@
@@ -2845,10 +2823,10 @@ index 0000000..14d89ed
 +    'gis-auth-dialog.h',
 +)
 diff --git a/gnome-initial-setup/pages/meson.build b/gnome-initial-setup/pages/meson.build
-index 7366385..8496608 100644
+index 7366385..2cc02aa 100644
 --- a/gnome-initial-setup/pages/meson.build
 +++ b/gnome-initial-setup/pages/meson.build
-@@ -9,7 +9,11 @@ pages = [
+@@ -9,7 +9,10 @@ pages = [
     'goa',
     'password',
     'summary',
@@ -2856,7 +2834,6 @@ index 7366385..8496608 100644
 +   'software',
 +   'ubuntu-report',
 +   'livepatch',
-+   'ubuntu-changes',
 +   'apps'
  ]
  
@@ -2887,1060 +2864,6 @@ index 150fe57..5b47be3 100644
      default:
        break;
      }
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/Makefile.am b/gnome-initial-setup/pages/ubuntu-changes/Makefile.am
-new file mode 100644
-index 0000000..3409262
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/Makefile.am
-@@ -0,0 +1,23 @@
-+
-+noinst_LTLIBRARIES = libgisubuntu-changes.la
-+
-+BUILT_SOURCES =
-+
-+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/ubuntu-changes.gresource.xml)
-+ubuntu-changes-resources.c: ubuntu-changes.gresource.xml $(resource_files)
-+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-+ubuntu-changes-resources.h: ubuntu-changes.gresource.xml $(resource_files)
-+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
-+BUILT_SOURCES += ubuntu-changes-resources.c ubuntu-changes-resources.h
-+
-+libgisubuntu_changes_la_SOURCES =	\
-+	gis-ubuntu-changes-page.c gis-ubuntu-changes-page.h	\
-+	$(BUILT_SOURCES)
-+
-+libgisubuntu_changes_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.." -I "$(top_srcdir)" -I "$(top_builddir)"
-+libgisubuntu_changes_la_LIBADD = $(INITIAL_SETUP_LIBS)
-+libgisubuntu_changes_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined
-+
-+EXTRA_DIST = ubuntu-changes.gresource.xml $(resource_files)
-+
-+CLEANFILES = $(BUILT_SOURCES)
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c
-new file mode 100644
-index 0000000..833d848
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c
-@@ -0,0 +1,175 @@
-+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-+/*
-+ * Copyright (C) 2018 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+/* Ubuntu changes page {{{1 */
-+
-+#define PAGE_ID "ubuntu-changes"
-+
-+#include "config.h"
-+#include "gis-ubuntu-changes-page.h"
-+#include "ubuntu-changes-resources.h"
-+
-+#include <glib/gi18n.h>
-+#include <gio/gio.h>
-+
-+struct _GisUbuntuChangesPagePrivate {
-+  GtkWidget *changes_image;
-+  GtkWidget *window_switcher_label;
-+  GtkWidget *launcher_label;
-+  GtkWidget *apps_button_label;
-+  GtkWidget *app_menu_label;
-+  GtkWidget *clock_calendar_label;
-+  GtkWidget *system_menu_label;
-+  GtkWidget *close_button_label;
-+};
-+typedef struct _GisUbuntuChangesPagePrivate GisUbuntuChangesPagePrivate;
-+
-+G_DEFINE_TYPE_WITH_PRIVATE (GisUbuntuChangesPage, gis_ubuntu_changes_page, GIS_TYPE_PAGE);
-+
-+static void
-+gis_ubuntu_changes_page_constructed (GObject *object)
-+{
-+  GisUbuntuChangesPage *page = GIS_UBUNTU_CHANGES_PAGE (object);
-+
-+  G_OBJECT_CLASS (gis_ubuntu_changes_page_parent_class)->constructed (object);
-+
-+  gis_page_set_skippable (GIS_PAGE (page), TRUE);
-+
-+  gis_page_set_complete (GIS_PAGE (page), TRUE);
-+  gtk_widget_show (GTK_WIDGET (page));
-+}
-+
-+static void
-+allocate_image (GtkWidget *fixed,
-+		GdkRectangle *allocation,
-+		GisUbuntuChangesPage *page)
-+{
-+  GisUbuntuChangesPagePrivate *priv = gis_ubuntu_changes_page_get_instance_private (page);
-+  gint image_width, image_height;
-+  gint window_switcher_width, window_switcher_height;
-+  gint launcher_width, launcher_height;
-+  gint apps_button_width, apps_button_height;
-+  gint app_menu_width, app_menu_height;
-+  gint clock_calendar_width, clock_calendar_height;
-+  gint system_menu_width, system_menu_height;
-+  gint close_button_width, close_button_height;
-+  gint image_x = 0, image_y = 0;
-+
-+  gtk_widget_get_preferred_width (priv->changes_image, NULL, &image_width);
-+  gtk_widget_get_preferred_height (priv->changes_image, NULL, &image_height);
-+  gtk_widget_get_preferred_width (priv->window_switcher_label, NULL, &window_switcher_width);
-+  gtk_widget_get_preferred_height (priv->window_switcher_label, NULL, &window_switcher_height);
-+  gtk_widget_get_preferred_width (priv->launcher_label, NULL, &launcher_width);
-+  gtk_widget_get_preferred_height (priv->launcher_label, NULL, &launcher_height);
-+  gtk_widget_get_preferred_width (priv->apps_button_label, NULL, &apps_button_width);
-+  gtk_widget_get_preferred_height (priv->apps_button_label, NULL, &apps_button_height);
-+  gtk_widget_get_preferred_width (priv->app_menu_label, NULL, &app_menu_width);
-+  gtk_widget_get_preferred_height (priv->app_menu_label, NULL, &app_menu_height);
-+  gtk_widget_get_preferred_width (priv->clock_calendar_label, NULL, &clock_calendar_width);
-+  gtk_widget_get_preferred_height (priv->clock_calendar_label, NULL, &clock_calendar_height);
-+  gtk_widget_get_preferred_width (priv->system_menu_label, NULL, &system_menu_width);
-+  gtk_widget_get_preferred_height (priv->system_menu_label, NULL, &system_menu_height);
-+  gtk_widget_get_preferred_width (priv->close_button_label, NULL, &close_button_width);
-+  gtk_widget_get_preferred_height (priv->close_button_label, NULL, &close_button_height);
-+
-+  /* Place image horizontally so all labels fit */
-+  if (window_switcher_width > image_x)
-+    image_x = window_switcher_width;
-+  if (launcher_width > image_x)
-+    image_x = launcher_width;
-+  if (apps_button_width > image_x)
-+    image_x = apps_button_width;
-+  if (system_menu_width > image_x)
-+    image_x = system_menu_width;
-+  if (close_button_width > image_x)
-+    image_x = close_button_width;
-+
-+  /* Place image vertically so all labels fit */
-+  if (app_menu_height > image_y)
-+    image_y = app_menu_height;
-+  if (clock_calendar_height > image_y)
-+    image_y = clock_calendar_height;
-+
-+  /* Use remaining space to center image */
-+  image_x += (allocation->width - (image_width + image_x * 2)) / 2;
-+  image_y += (allocation->height - (image_height + image_y * 2)) / 2;
-+
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->changes_image, image_x, image_y);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->window_switcher_label, image_x - window_switcher_width, image_y + 46 - window_switcher_height / 2);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->launcher_label, image_x - launcher_width, image_y + 138 - launcher_height / 2);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->apps_button_label, image_x - apps_button_width, image_y + 278 - apps_button_height / 2);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->app_menu_label, image_x + 139 - app_menu_width / 2, image_y - app_menu_height);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->clock_calendar_label, image_x + 249, image_y - clock_calendar_height);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->system_menu_label, image_x + image_width, image_y + 46 - system_menu_height / 2);
-+  gtk_fixed_move (GTK_FIXED (fixed), priv->close_button_label, image_x + image_width, image_y + 125 - system_menu_height / 2);
-+}
-+
-+static gboolean
-+activate_link (GtkLabel             *label,
-+               const gchar          *uri,
-+               GisUbuntuChangesPage *page)
-+{
-+  /* FIXME: Show changes */
-+
-+  return TRUE;
-+}
-+
-+static void
-+gis_ubuntu_changes_page_locale_changed (GisPage *page)
-+{
-+  gis_page_set_title (GIS_PAGE (page), _("What's new in Ubuntu"));
-+}
-+
-+static void
-+gis_ubuntu_changes_page_class_init (GisUbuntuChangesPageClass *klass)
-+{
-+  GisPageClass *page_class = GIS_PAGE_CLASS (klass);
-+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-ubuntu-changes-page.ui");
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, changes_image);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, window_switcher_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, launcher_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, apps_button_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, app_menu_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, clock_calendar_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, system_menu_label);
-+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisUbuntuChangesPage, close_button_label);
-+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), allocate_image);
-+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), activate_link);
-+
-+  page_class->page_id = PAGE_ID;
-+  page_class->locale_changed = gis_ubuntu_changes_page_locale_changed;
-+  object_class->constructed = gis_ubuntu_changes_page_constructed;
-+}
-+
-+static void
-+gis_ubuntu_changes_page_init (GisUbuntuChangesPage *page)
-+{
-+  g_resources_register (ubuntu_changes_get_resource ());
-+
-+  gtk_widget_init_template (GTK_WIDGET (page));
-+}
-+
-+GisPage *
-+gis_prepare_ubuntu_changes_page (GisDriver *driver)
-+{
-+  return g_object_new (GIS_TYPE_UBUNTU_CHANGES_PAGE,
-+                       "driver", driver,
-+                       NULL);
-+}
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h
-new file mode 100644
-index 0000000..a1c1e59
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h
-@@ -0,0 +1,52 @@
-+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-+/*
-+ * Copyright (C) 2018 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of the
-+ * License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __GIS_UBUNTU_CHANGES_PAGE_H__
-+#define __GIS_UBUNTU_CHANGES_PAGE_H__
-+
-+#include "gnome-initial-setup.h"
-+
-+G_BEGIN_DECLS
-+
-+#define GIS_TYPE_UBUNTU_CHANGES_PAGE            (gis_ubuntu_changes_page_get_type ())
-+#define GIS_UBUNTU_CHANGES_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIS_TYPE_UBUNTU_CHANGES_PAGE, GisUbuntuChangesPage))
-+#define GIS_UBUNTU_CHANGES_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIS_TYPE_UBUNTU_CHANGES_PAGE, GisUbuntuChangesPageClass))
-+#define GIS_IS_UBUNTU_CHANGES_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIS_TYPE_UBUNTU_CHANGES_PAGE))
-+#define GIS_IS_UBUNTU_CHANGES_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIS_TYPE_UBUNTU_CHANGES_PAGE))
-+#define GIS_UBUNTU_CHANGES_PAGE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIS_TYPE_UBUNTU_CHANGES_PAGE, GisUbuntuChangesPageClass))
-+
-+typedef struct _GisUbuntuChangesPage        GisUbuntuChangesPage;
-+typedef struct _GisUbuntuChangesPageClass   GisUbuntuChangesPageClass;
-+
-+struct _GisUbuntuChangesPage
-+{
-+  GisPage parent;
-+};
-+
-+struct _GisUbuntuChangesPageClass
-+{
-+  GisPageClass parent_class;
-+};
-+
-+GType gis_ubuntu_changes_page_get_type (void);
-+
-+GisPage *gis_prepare_ubuntu_changes_page (GisDriver *driver);
-+
-+G_END_DECLS
-+
-+#endif /* __GIS_UBUNTU_CHANGES_PAGE_H__ */
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.ui b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.ui
-new file mode 100644
-index 0000000..7210cc6
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.ui
-@@ -0,0 +1,118 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<interface>
-+  <!-- interface-requires gtk+ 3.0 -->
-+  <template class="GisUbuntuChangesPage" parent="GisPage">
-+    <child>
-+      <object class="GtkBox" id="box">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <property name="halign">fill</property>
-+        <property name="valign">fill</property>
-+        <property name="orientation">vertical</property>
-+        <property name="border_width">20</property>
-+        <child>
-+          <object class="GtkLabel" id="title">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="halign">start</property>
-+            <property name="hexpand">True</property>
-+            <property name="valign">start</property>
-+            <property name="label" translatable="yes">What's new in Ubuntu</property>
-+            <attributes>
-+              <attribute name="weight" value="bold"/>
-+              <attribute name="scale" value="1.8"/>
-+            </attributes>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkLabel">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="max-width-chars">50</property>
-+            <property name="halign">start</property>
-+            <property name="hexpand">False</property>
-+            <property name="margin_top">18</property>
-+            <property name="label" translatable="yes">Ubuntu 18.04 works differently from older versions.</property>
-+            <property name="wrap">True</property>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkFixed">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="margin_top">50</property>
-+            <signal name="size-allocate" handler="allocate_image"/>
-+            <child>
-+              <object class="GtkImage" id="changes_image">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="resource">/org/gnome/initial-setup/ubuntu-changes.png</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="window_switcher_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Window switcher</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="launcher_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Dock</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="apps_button_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Apps button</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="app_menu_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Application menu</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="clock_calendar_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Calendar and notifications</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="system_menu_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">System menu</property>
-+              </object>
-+            </child>
-+            <child>
-+              <object class="GtkLabel" id="close_button_label">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="label" translatable="yes">Close button</property>
-+              </object>
-+            </child>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkLabel" id="guide_label">
-+            <property name="visible">False</property>
-+            <property name="can_focus">False</property>
-+            <property name="halign">start</property>
-+            <property name="margin_top">18</property>
-+            <property name="label" translatable="yes">If you like, you can read a &lt;a href=""&gt;quick guide to the new system&lt;/a&gt;.</property>
-+            <property name="use-markup">True</property>
-+            <property name="wrap">True</property>
-+            <signal name="activate-link" handler="activate_link"/>
-+          </object>
-+        </child>
-+      </object>
-+    </child>
-+  </template>
-+</interface>
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/meson.build b/gnome-initial-setup/pages/ubuntu-changes/meson.build
-new file mode 100644
-index 0000000..5312ecc
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/meson.build
-@@ -0,0 +1,10 @@
-+sources += gnome.compile_resources(
-+    'ubuntu-changes-resources',
-+    files('ubuntu-changes.gresource.xml'),
-+    c_name: 'ubuntu_changes'
-+)
-+
-+sources += files(
-+    'gis-ubuntu-changes-page.c',
-+    'gis-ubuntu-changes-page.h',
-+)
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.gresource.xml b/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.gresource.xml
-new file mode 100644
-index 0000000..946b23b
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.gresource.xml
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gresources>
-+  <gresource prefix="/org/gnome/initial-setup">
-+    <file preprocess="xml-stripblanks" alias="gis-ubuntu-changes-page.ui">gis-ubuntu-changes-page.ui</file>
-+    <file alias="ubuntu-changes.png">ubuntu-changes.png</file>
-+  </gresource>
-+</gresources>
-+
-diff --git a/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.png b/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.png
-new file mode 100644
-index 0000000..7b787ac
---- /dev/null
-+++ b/gnome-initial-setup/pages/ubuntu-changes/ubuntu-changes.png
-@@ -0,0 +1,625 @@
-+�PNG
-+
-+