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-13 18:33:07.000000000 +0000 +++ gnome-online-accounts-3.28.0/debian/changelog 2018-04-18 15:04:29.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-online-accounts (3.28.0-0ubuntu2) bionic; urgency=medium + + * debian/patches/0002-livepatch-auth: Don't show an error message if the + polkit authentication dialog is dimissed by the user (LP: #1764989). + + -- Andrea Azzarone Wed, 18 Apr 2018 16:52:39 +0200 + gnome-online-accounts (3.28.0-0ubuntu1) bionic; urgency=medium * New upstream release 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-13 18:33:07.000000000 +0000 +++ gnome-online-accounts-3.28.0/debian/control 2018-04-18 15:04:36.000000000 +0000 @@ -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-13 18:33:07.000000000 +0000 +++ gnome-online-accounts-3.28.0/debian/patches/0001-ubuntu-sso-provider.patch 2018-04-18 15:04:16.000000000 +0000 @@ -24,9 +24,9 @@ po/POTFILES.in | 1 + src/goabackend/Makefile.am | 3 + src/goabackend/goaprovider.c | 4 + - src/goabackend/goaubuntussoprovider.c | 885 +++++++++++++++++++++++++++++ + src/goabackend/goaubuntussoprovider.c | 889 +++++++++++++++++++++++++++++ src/goabackend/goaubuntussoprovider.h | 39 ++ - 18 files changed, 955 insertions(+) + 18 files changed, 959 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 @@ -37,7 +37,7 @@ create mode 100644 src/goabackend/goaubuntussoprovider.h diff --git a/configure.ac b/configure.ac -index 546594e..d66f0dd 100644 +index 8801167..ab2ec82 100644 --- a/configure.ac +++ b/configure.ac @@ -148,6 +148,12 @@ if test "$enable_backend" != "no"; then @@ -291,10 +291,10 @@ #endif diff --git a/src/goabackend/goaubuntussoprovider.c b/src/goabackend/goaubuntussoprovider.c new file mode 100644 -index 0000000..8d75578 +index 0000000..7e3b6ac --- /dev/null +++ b/src/goabackend/goaubuntussoprovider.c -@@ -0,0 +1,885 @@ +@@ -0,0 +1,889 @@ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* + * Copyright © 2018 Canonical Ltd @@ -943,6 +943,10 @@ + gtk_widget_set_no_show_all (data->cluebar, FALSE); + gtk_widget_show_all (data->cluebar); + } ++ else if (data->error->code == SNAPD_ERROR_PERMISSION_DENIED) ++ { ++ g_clear_error (&data->error); ++ } + else + { + g_autofree gchar *markup = NULL; 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-13 18:33:07.000000000 +0000 +++ gnome-online-accounts-3.28.0/debian/patches/0002-livepatch-auth.patch 2018-04-18 15:04:16.000000000 +0000 @@ -16,10 +16,10 @@ create mode 100644 data/scripts/Makefile.am create mode 100755 data/scripts/lpa_helper.py -Index: gnome-online-accounts-3.27.92/configure.ac +Index: gnome-online-accounts/configure.ac =================================================================== ---- gnome-online-accounts-3.27.92.orig/configure.ac -+++ gnome-online-accounts-3.27.92/configure.ac +--- gnome-online-accounts.orig/configure.ac ++++ gnome-online-accounts/configure.ac @@ -581,6 +581,7 @@ data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/96x96/Makefile @@ -28,10 +28,10 @@ src/Makefile src/goa/Makefile src/goa/goa-1.0.pc -Index: gnome-online-accounts-3.27.92/data/Makefile.am +Index: gnome-online-accounts/data/Makefile.am =================================================================== ---- gnome-online-accounts-3.27.92.orig/data/Makefile.am -+++ gnome-online-accounts-3.27.92/data/Makefile.am +--- gnome-online-accounts.orig/data/Makefile.am ++++ gnome-online-accounts/data/Makefile.am @@ -1,7 +1,7 @@ NULL = @@ -46,10 +46,10 @@ -include $(top_srcdir)/git.mk + -Index: gnome-online-accounts-3.27.92/data/scripts/Makefile.am +Index: gnome-online-accounts/data/scripts/Makefile.am =================================================================== --- /dev/null -+++ gnome-online-accounts-3.27.92/data/scripts/Makefile.am ++++ gnome-online-accounts/data/scripts/Makefile.am @@ -0,0 +1,14 @@ +NULL = + @@ -66,10 +66,10 @@ + +-include $(top_srcdir)/git.mk \ No newline at end of file -Index: gnome-online-accounts-3.27.92/data/scripts/lpa_helper.py +Index: gnome-online-accounts/data/scripts/lpa_helper.py =================================================================== --- /dev/null -+++ gnome-online-accounts-3.27.92/data/scripts/lpa_helper.py ++++ gnome-online-accounts/data/scripts/lpa_helper.py @@ -0,0 +1,139 @@ +#!/usr/bin/env python3 +import json @@ -210,10 +210,10 @@ + except Exception as e: + print(generic_error, e, file=sys.stderr) + sys.exit(1) -Index: gnome-online-accounts-3.27.92/src/goabackend/Makefile.am +Index: gnome-online-accounts/src/goabackend/Makefile.am =================================================================== ---- gnome-online-accounts-3.27.92.orig/src/goabackend/Makefile.am -+++ gnome-online-accounts-3.27.92/src/goabackend/Makefile.am +--- gnome-online-accounts.orig/src/goabackend/Makefile.am ++++ gnome-online-accounts/src/goabackend/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"GoaBackend\" \ -DGOA_BACKEND_COMPILATION \ @@ -222,10 +222,10 @@ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \ -Index: gnome-online-accounts-3.27.92/src/goabackend/goaubuntussoprovider.c +Index: gnome-online-accounts/src/goabackend/goaubuntussoprovider.c =================================================================== ---- gnome-online-accounts-3.27.92.orig/src/goabackend/goaubuntussoprovider.c -+++ gnome-online-accounts-3.27.92/src/goabackend/goaubuntussoprovider.c +--- gnome-online-accounts.orig/src/goabackend/goaubuntussoprovider.c ++++ gnome-online-accounts/src/goabackend/goaubuntussoprovider.c @@ -20,6 +20,7 @@ #include "config.h" @@ -460,7 +460,7 @@ g_clear_object (&data->cancellable); data->cancellable = g_cancellable_new (); -@@ -664,6 +812,59 @@ get_tokens_and_identity (GoaProvider +@@ -668,6 +816,59 @@ get_tokens_and_identity (GoaProvider goto login_again; }