Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Review: Approve K, makes sense, thanks for the work, approving now! -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
@seb128 This will make sure that the window will be closed but the process will keep running until livepatch is installed (or failed to install). The user will notice nothing different. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Review: Needs Information The error handling seems fine to me, could you explain what the "quit" changes are about. Is that blocking from closing or from going to the next page until you get feedback from the service? What is the typical delay it creates? -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Review: Approve design Thanks for the text fixes -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
You have been requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 4ce35cf..035bb0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-initial-setup (3.28.0-2ubuntu7) UNRELEASED; urgency=medium + + * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: +- Show an error message in case livepatch setup fails. This also will + make sure that gnome-intial-setup does not quit before livepatch + responds back (LP: #1764723). + + -- Andrea Azzarone Mon, 03 Sep 2018 15:28:27 + + gnome-initial-setup (3.28.0-2ubuntu6.16.04.1) bionic; 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 1ba127d..e092d80 100644 --- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch +++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch @@ -8,21 +8,24 @@ This commit is a combined work of a number of authors. data/Makefile.am | 6 + data/com.ubuntu.welcome.policy.in | 21 + gnome-initial-setup/Makefile.am| 4 + + gnome-initial-setup/gis-driver.c | 35 ++ + gnome-initial-setup/gis-driver.h | 6 + gnome-initial-setup/gnome-initial-setup.c | 40 +- gnome-initial-setup/pages/Makefile.am | 6 +- gnome-initial-setup/pages/apps/Makefile.am | 21 + gnome-initial-setup/pages/apps/apps.gresource.xml | 8 + .../pages/apps/default-snap-icon.svg | 1 + - gnome-initial-setup/pages/apps/gis-apps-page.c | 531 + + gnome-initial-setup/pages/apps/gis-apps-page.c | 531 gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++ gnome-initial-setup/pages/apps/gis-apps-page.ui| 96 gnome-initial-setup/pages/livepatch/Makefile.am| 21 + - .../pages/livepatch/gis-livepatch-page.c | 483 +++ + .../pages/livepatch/gis-livepatch-page.c | 534 + .../pages/livepatch/gis-livepatch-page.h | 52 ++ .../pages/livepatch/gis-livepatch-page.ui | 156 ++ .../pages/livepatch/livepatch.gresource.xml| 8 + gnome-initial-setup/pages/livepatch/livepatch.svg | 1 + .../pages/privacy/gis-privacy-page.c | 2 +- + .../pages/summary/gis-summary-page.c | 2 +- .../pages/ubuntu-changes/Makefile.am | 21 + .../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 177 +++ .../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++ @@ -36,7 +39,7 @@ This commit is a combined work of a number of authors. .../ubuntu-report/ubuntu-report.gresource.xml | 8 + .../pages/ubuntu-report/ubuntu-report.svg | 1 + po/POTFILES.in | 9 + - 32 files changed, 2404 insertions(+), 5 deletions(-) + 35 files changed, 2497 insertions(+), 6 deletions(-) create mode 100644 data/com.ubuntu.welcome.policy.in create mode 100644 gnome-initial-setup/pages/apps/Makefile.am create mode 100644 gnome-initial-setup/pages/apps/apps.gresource.xml @@ -164,8 +167,78 @@ index c04f1e4..6c36682 100644 $(INITIAL_SETUP_LIBS) \ -lm +diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +index eeaf1b7..6267b32 100644 +--- a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +@@ -78,6 +78,9 @@ struct _GisDriverPrivate { + GisDriverMode mode; + UmAccountMode account_mode; + gboolean small_screen; ++ ++ guint inhibit_count; ++ gboolean quit_requested; + }; + typedef struct _GisDriverPrivate GisDriverPrivate; + +@@ -535,6 +538,38 @@ gis_driver_save_data (GisDriver *driver) + gis_assistant_save_data (priv->assistant); + } + ++void ++gis_driver_inhibit_quit (GisDriver *driver) ++{ ++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver); ++ priv->inhibit_count++; ++} ++ ++void ++gis_driver_uninhibit_quit (GisDriver *driver) ++{ ++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver); ++ ++ priv->inhibit_count--; ++ if (!priv->inhibit_count && priv->quit_requested) ++gis_driver_quit (driver); ++} ++ ++void gis_driver_quit (GisDriver *driver) ++{ ++ GisDriverPrivate *priv = gis_driver_get_instance_private (d
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. Commit message: livepatch: show an error in case of failure Show an error message in case livepatch setup fails. This also will make sure that gnome-intial-setup does not quit before livepatch responds back. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 4ce35cf..035bb0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-initial-setup (3.28.0-2ubuntu7) UNRELEASED; urgency=medium + + * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: +- Show an error message in case livepatch setup fails. This also will + make sure that gnome-intial-setup does not quit before livepatch + responds back (LP: #1764723). + + -- Andrea Azzarone Mon, 03 Sep 2018 15:28:27 + + gnome-initial-setup (3.28.0-2ubuntu6.16.04.1) bionic; 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 1ba127d..229e026 100644 --- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch +++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch @@ -8,21 +8,24 @@ This commit is a combined work of a number of authors. data/Makefile.am | 6 + data/com.ubuntu.welcome.policy.in | 21 + gnome-initial-setup/Makefile.am| 4 + + gnome-initial-setup/gis-driver.c | 35 ++ + gnome-initial-setup/gis-driver.h | 6 + gnome-initial-setup/gnome-initial-setup.c | 40 +- gnome-initial-setup/pages/Makefile.am | 6 +- gnome-initial-setup/pages/apps/Makefile.am | 21 + gnome-initial-setup/pages/apps/apps.gresource.xml | 8 + .../pages/apps/default-snap-icon.svg | 1 + - gnome-initial-setup/pages/apps/gis-apps-page.c | 531 + + gnome-initial-setup/pages/apps/gis-apps-page.c | 531 gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++ gnome-initial-setup/pages/apps/gis-apps-page.ui| 96 gnome-initial-setup/pages/livepatch/Makefile.am| 21 + - .../pages/livepatch/gis-livepatch-page.c | 483 +++ + .../pages/livepatch/gis-livepatch-page.c | 534 + .../pages/livepatch/gis-livepatch-page.h | 52 ++ .../pages/livepatch/gis-livepatch-page.ui | 156 ++ .../pages/livepatch/livepatch.gresource.xml| 8 + gnome-initial-setup/pages/livepatch/livepatch.svg | 1 + .../pages/privacy/gis-privacy-page.c | 2 +- + .../pages/summary/gis-summary-page.c | 2 +- .../pages/ubuntu-changes/Makefile.am | 21 + .../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 177 +++ .../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++ @@ -36,7 +39,7 @@ This commit is a combined work of a number of authors. .../ubuntu-report/ubuntu-report.gresource.xml | 8 + .../pages/ubuntu-report/ubuntu-report.svg | 1 + po/POTFILES.in | 9 + - 32 files changed, 2404 insertions(+), 5 deletions(-) + 35 files changed, 2497 insertions(+), 6 deletions(-) create mode 100644 data/com.ubuntu.welcome.policy.in create mode 100644 gnome-initial-setup/pages/apps/Makefile.am create mode 100644 gnome-initial-setup/pages/apps/apps.gresource.xml @@ -164,8 +167,78 @@ index c04f1e4..6c36682 100644 $(INITIAL_SETUP_LIBS) \ -lm +diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +index eeaf1b7..6267b32 100644 +--- a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c +@@ -78,6 +78,9 @@ struct _GisDriverPrivate { + GisDriverMode mode; + UmAccountMode account_mode; + gboolean small_screen; ++ ++ guint inhibit_count; ++ gboolean quit_requested; + }; + typedef struct _GisDriverPrivate GisDriverPrivate; + +@@ -535,6 +538,38 @@ gis_driver_save_data (GisDriver *driver) + gis_assistant_save_data (priv->assistant); + } + ++void ++gis_driver_inhibit_quit (GisDriver *driver) ++{ ++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver); ++ priv->inhibit_count++; ++} ++ ++void ++gis_driver_uninhibit_quit (GisDriver *driver) ++{ ++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver); ++ ++
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Few weeks ago I proposed a patch to fix this problem without chaning the street. There should be no problem chaning it now. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic has been updated. Commit message changed to: livepatch: show an error in case of failure Show an error message in case livepatch setup fails. This also will make sure that gnome-intial-setup does not quit before livepatch responds back. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop