diff -Nru gnome-online-accounts-3.28.0/debian/changelog gnome-online-accounts-3.28.0/debian/changelog --- gnome-online-accounts-3.28.0/debian/changelog 2018-04-18 10:04:29.000000000 -0500 +++ gnome-online-accounts-3.28.0/debian/changelog 2018-05-25 09:04:11.000000000 -0500 @@ -1,3 +1,11 @@ +gnome-online-accounts (3.28.0-0ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/0001-ubuntu-sso-provider.patch: Add a link to the + link to the privacy policy in U1 login dialog (LP: #1773213). + * debian/patches/0002-livepatch-auth: Refresh patch. + + -- Andrea Azzarone Fri, 25 May 2018 09:04:11 -0500 + gnome-online-accounts (3.28.0-0ubuntu2) bionic; urgency=medium * debian/patches/0002-livepatch-auth: Don't show an error message if the diff -Nru gnome-online-accounts-3.28.0/debian/control gnome-online-accounts-3.28.0/debian/control --- gnome-online-accounts-3.28.0/debian/control 2018-04-18 10:04:36.000000000 -0500 +++ gnome-online-accounts-3.28.0/debian/control 2018-05-25 09:04:11.000000000 -0500 @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: gnome-online-accounts @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha , Michael Biebl +Uploaders: Jeremy Bicha , Michael Biebl Build-Depends: debhelper (>= 10.3), autoconf-archive, gnome-pkg-tools (>= 0.10), diff -Nru gnome-online-accounts-3.28.0/debian/patches/0001-ubuntu-sso-provider.patch gnome-online-accounts-3.28.0/debian/patches/0001-ubuntu-sso-provider.patch --- gnome-online-accounts-3.28.0/debian/patches/0001-ubuntu-sso-provider.patch 2018-04-18 10:04:16.000000000 -0500 +++ gnome-online-accounts-3.28.0/debian/patches/0001-ubuntu-sso-provider.patch 2018-05-25 08:52:48.000000000 -0500 @@ -24,9 +24,9 @@ po/POTFILES.in | 1 + src/goabackend/Makefile.am | 3 + src/goabackend/goaprovider.c | 4 + - src/goabackend/goaubuntussoprovider.c | 889 +++++++++++++++++++++++++++++ + src/goabackend/goaubuntussoprovider.c | 900 +++++++++++++++++++++++++++++ src/goabackend/goaubuntussoprovider.h | 39 ++ - 18 files changed, 959 insertions(+) + 18 files changed, 970 insertions(+) create mode 100644 data/icons/16x16/goa-account-ubuntusso.png create mode 100644 data/icons/22x22/goa-account-ubuntusso.png create mode 100644 data/icons/24x24/goa-account-ubuntusso.png @@ -291,10 +291,10 @@ #endif diff --git a/src/goabackend/goaubuntussoprovider.c b/src/goabackend/goaubuntussoprovider.c new file mode 100644 -index 0000000..7e3b6ac +index 0000000..14bfc8e --- /dev/null +++ b/src/goabackend/goaubuntussoprovider.c -@@ -0,0 +1,889 @@ +@@ -0,0 +1,900 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* + * Copyright © 2018 Canonical Ltd @@ -650,6 +650,8 @@ + GtkWidget *grid1; + GtkWidget *grid2; + GtkWidget *label; ++ GtkWidget *footer_box; ++ GtkWidget *privacy_button; + GObject *revealer; + GtkWidget *spinner; + gint row; @@ -735,10 +737,14 @@ + gtk_dialog_set_default_response (data->dialog, GTK_RESPONSE_OK); + gtk_dialog_set_response_sensitive (data->dialog, GTK_RESPONSE_OK, FALSE); + ++ footer_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); ++ gtk_widget_show (footer_box); ++ gtk_container_add (GTK_CONTAINER (grid0), footer_box); ++ + data->progress_grid = gtk_grid_new (); + gtk_orientable_set_orientation (GTK_ORIENTABLE (data->progress_grid), GTK_ORIENTATION_HORIZONTAL); + gtk_grid_set_column_spacing (GTK_GRID (data->progress_grid), 3); -+ gtk_container_add (GTK_CONTAINER (grid0), data->progress_grid); ++ gtk_box_pack_start (GTK_CONTAINER (footer_box), data->progress_grid, TRUE, TRUE, 0); + + spinner = gtk_spinner_new (); + gtk_widget_set_opacity (spinner, 0.0); @@ -750,10 +756,15 @@ + gtk_widget_set_opacity (label, 0.0); + gtk_container_add (GTK_CONTAINER (data->progress_grid), label); + ++ privacy_button = gtk_link_button_new_with_label ("https://www.ubuntu.com/legal/dataprivacy", ++ _("Privacy Policy")); ++ gtk_widget_show (privacy_button); ++ gtk_box_pack_end (GTK_BOX (footer_box), privacy_button, FALSE, FALSE, 0); ++ + if (new_account) + { + gtk_window_get_size (GTK_WINDOW (data->dialog), &width, NULL); -+ gtk_window_set_default_size (GTK_WINDOW (data->dialog), width, -1); ++ gtk_window_set_default_size (GTK_GRID (data->dialog), width, -1); + } + else + { diff -Nru gnome-online-accounts-3.28.0/debian/patches/0002-livepatch-auth.patch gnome-online-accounts-3.28.0/debian/patches/0002-livepatch-auth.patch --- gnome-online-accounts-3.28.0/debian/patches/0002-livepatch-auth.patch 2018-04-18 10:04:16.000000000 -0500 +++ gnome-online-accounts-3.28.0/debian/patches/0002-livepatch-auth.patch 2018-05-25 09:03:52.000000000 -0500 @@ -260,7 +260,7 @@ if (discharges_str) discharges_var = g_variant_parse (G_VARIANT_TYPE ("as"), discharges_str, NULL, NULL, NULL); if (discharges_var) -@@ -430,7 +436,6 @@ create_account_details_ui (GoaProvider +@@ -432,7 +438,6 @@ create_account_details_ui (GoaProvider row = 0; add_entry (grid2, row++, _("Passc_ode:"), &data->otp_entry); @@ -268,7 +268,7 @@ g_signal_connect (data->otp_entry, "changed", G_CALLBACK (on_otp_changed), data); gtk_dialog_add_button (data->dialog, _("_Cancel"), GTK_RESPONSE_CANCEL); -@@ -481,8 +486,8 @@ get_snapd_error_message (GError *error) +@@ -492,8 +497,8 @@ get_snapd_error_message (GError *error) { g_return_val_if_fail (error != NULL, NULL); @@ -279,7 +279,7 @@ if (g_error_matches (error, SNAPD_ERROR, SNAPD_ERROR_AUTH_DATA_REQUIRED)) return _("Provided email/password is not correct"); -@@ -492,6 +497,31 @@ get_snapd_error_message (GError *error) +@@ -503,6 +508,31 @@ get_snapd_error_message (GError *error) return _("Something went wrong, please try again"); } @@ -311,7 +311,7 @@ static void dialog_response_cb (GtkDialog *dialog, gint response_id, -@@ -526,6 +556,120 @@ snapd_login_ready_cb (GObject *object, +@@ -537,6 +567,120 @@ snapd_login_ready_cb (GObject *object, } static void @@ -432,7 +432,7 @@ add_account_cb (GoaManager *manager, GAsyncResult *res, gpointer user_data) -@@ -549,8 +693,8 @@ add_credentials_key_values (GVariantBuil +@@ -560,8 +704,8 @@ add_credentials_key_values (GVariantBuil discharges_var = g_variant_new_strv ((const gchar * const*) data->discharges, -1); discharges_str = g_variant_print (discharges_var, FALSE); g_variant_builder_add (builder, "{sv}", "discharges", g_variant_new_string (discharges_str)); @@ -442,7 +442,7 @@ static gboolean get_tokens_and_identity (GoaProvider *provider, gboolean add_account, -@@ -564,6 +708,7 @@ get_tokens_and_identity (GoaProvider +@@ -575,6 +719,7 @@ get_tokens_and_identity (GoaProvider const gchar *username; const gchar *otp; gint response; @@ -450,7 +450,7 @@ g_return_val_if_fail (GOA_IS_UBUNTU_SSO_PROVIDER (provider), FALSE); g_return_val_if_fail ((!add_account && existing_identity != NULL && existing_identity[0] != '\0') -@@ -608,6 +753,9 @@ get_tokens_and_identity (GoaProvider +@@ -619,6 +764,9 @@ get_tokens_and_identity (GoaProvider otp = gtk_entry_get_text (GTK_ENTRY (data->otp_entry)); otp = otp && strlen (otp) > 0 ? otp : NULL; @@ -460,7 +460,7 @@ g_clear_object (&data->cancellable); data->cancellable = g_cancellable_new (); -@@ -668,6 +816,59 @@ get_tokens_and_identity (GoaProvider +@@ -679,6 +827,59 @@ get_tokens_and_identity (GoaProvider goto login_again; }