Merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-livepatch-privacy-url-from-etc-os-release into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master

[Andrea Azzarone]

[Sebastien Bacher (seb128)]

Thank you for your bug report. Is there a report about that? What's the rational to point to another page than the one previously used?

review: Needs Information

[Andrea Azzarone (azzar1)]

> Thank you for your bug report. Is there a report about that? What's the
> rational to point to another page than the one previously used?

There is no bug report but I can create it if needed. It's the same page but we get it from /etc/os-release as we do in other parts.

[Sebastien Bacher (seb128)]

We removed the code to parse os-relase no? (since the "what is being reported to Canonical" info is different from a legal notice). In any case, if Will confirms it's the right page go for it

[Andrea Azzarone (azzar1)]

> We removed the code to parse os-relase no? (since the "what is being reported
> to Canonical" info is different from a legal notice)

That was for the report page.

In any case, if Will confirms it's the right page go for it

The livepatch page should point out to the link in /etc/os-release. Will agreed on /etc/os-release in irc.

[Will Cooke (willcooke)]

The correct policy for __Livepatch__ is: https://www.ubuntu.com/legal/data-privacy
The "PRIVACY_POLICY_URL" in /etc/os-release does indeed point to that page.
Therefore +1.

Note the Ubuntu Report page must still point to the other policy at https://www.ubuntu.com/legal/systems-information-notice. This patch does not touch that and Seb already fixed it.

[Sebastien Bacher (seb128)]

K, fine, let's merge that then :)

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 64201c2..3a5dc35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-initial-setup (3.30.0-1ubuntu5) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+    - Use privacy URL from /etc/os-release in Livepatch page.
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 19 Nov 2018 18:08:23 +0000
+
 gnome-initial-setup (3.30.0-1ubuntu4) disco; 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 ee1033e..3271d3a 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -26,7 +26,7 @@ Subject: Add Ubuntu mode with special pages
  .../pages/livepatch/gis-auth-dialog.c              | 528 ++++++++++++++++++++
  .../pages/livepatch/gis-auth-dialog.h              |  40 ++
  .../pages/livepatch/gis-auth-dialog.ui             | 231 +++++++++
- .../pages/livepatch/gis-livepatch-page.c           | 533 +++++++++++++++++++++
+ .../pages/livepatch/gis-livepatch-page.c           | 538 +++++++++++++++++++++
  .../pages/livepatch/gis-livepatch-page.h           |  52 ++
  .../pages/livepatch/gis-livepatch-page.ui          | 156 ++++++
  .../pages/livepatch/livepatch.gresource.xml        |   9 +
@@ -44,7 +44,7 @@ Subject: Add Ubuntu mode with special pages
  .../pages/ubuntu-report/ubuntu-report.svg          |   1 +
  meson.build                                        |   3 +
  po/POTFILES.in                                     |  12 +
- 41 files changed, 2969 insertions(+), 7 deletions(-)
+ 41 files changed, 2974 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
@@ -2025,10 +2025,10 @@ 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..e604819
+index 0000000..eab2fb6
 --- /dev/null
 +++ b/gnome-initial-setup/pages/livepatch/gis-livepatch-page.c
-@@ -0,0 +1,533 @@
+@@ -0,0 +1,538 @@
 +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 +/*
 + * Copyright (C) 2018 Canonical Ltd.
@@ -2452,10 +2452,15 @@ index 0000000..e604819
 +static void
 +show_legal (GtkButton *button, GisLivepatchPage *page)
 +{
++  g_autofree gchar *buffer = NULL;
++  g_autofree gchar *privacy_policy = NULL;
 +  g_autoptr(GError) error = NULL;
 +
++  if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
++    privacy_policy = get_item (buffer, "PRIVACY_POLICY_URL");
++
 +  if (!gtk_show_uri_on_window (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),
-+                               "https://www.ubuntu.com/legal/terms-and-policies/systems-information-notice",
++                               privacy_policy,
 +                               GDK_CURRENT_TIME, &error)) {
 +    GtkWidget *dialog;
 +    dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (page))),