Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Approve LGTM now! Thanks for fixing the dep :) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354045 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/354176 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master. -- 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
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);
++
++ priv->inhibit
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Review: Approve >From IRC: Trevinho: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/353828/comments/921762 as well Trevinho: have you just repushed another commit with the initial date staying the same? (hard to know with launchpad MP UI) which sounds like from the diff ah interesting, you can switch the diff and you see the the new diff was generated on the 30 while the commit is still on the 28… (but no evidence that you pushed a new commit) quite confusing, used to gitlab/github when you see something else was pushed and overrides looks good to approve now then! -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/353828 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/353826 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
I didn't see any repush? or any MP fixing those? -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/353828 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- 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
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] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/353828 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/353826 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
FYI I've submitted also part of this upstream (as it will be needed anyway for future developments): https://gitlab.gnome.org/GNOME/nautilus/merge_requests/303 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/353826 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-3.29.92 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354045 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve LGTM, thanks for addressing the issues and answering my questions :) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/353826 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-online-accounts:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master
Review: Approve Thanks! -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-online-accounts/+git/gnome-online-accounts/+merge/354176 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-online-accounts:ubuntu/master. -- 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
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Approve
Just a nitpick on wrong alignement, but otherwise, looks good :)
Diff comments:
> diff --git
> a/debian/patches/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
>
> b/debian/patches/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
> new file mode 100644
> index 000..f601fd2
> --- /dev/null
> +++
> b/debian/patches/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
> @@ -0,0 +1,167 @@
> +From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
> +Date: Thu, 23 Aug 2018 20:00:57 +0200
> +Subject: search: call XUbuntuCancel method on providers when no data is
> + needed
> +
> +Add XUbuntuCancel method to search providers and call it when a search
> provider
> +is still doing operations.
> +Ignore the result when the method does not exist or is cancelled.
> +
> +This will allow to stop operations on providers.
> +
> +Fixes LP: #1756826
> +
> +Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
> +Bug-Ubuntu:
> https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
> +Forwarded: not-needed
> +---
> + data/org.gnome.ShellSearchProvider.xml | 6 ++
> + data/org.gnome.ShellSearchProvider2.xml | 6 ++
> + js/ui/remoteSearch.js | 15 +++
> + js/ui/search.js | 34
> +
> + 4 files changed, 61 insertions(+)
> +
> +diff --git a/data/org.gnome.ShellSearchProvider.xml
> b/data/org.gnome.ShellSearchProvider.xml
> +index 78ad305..393cb01 100644
> +--- a/data/org.gnome.ShellSearchProvider.xml
> b/data/org.gnome.ShellSearchProvider.xml
> +@@ -69,5 +69,11 @@
> +
> +
> +
> ++
> ++
> ++
> +
> +
> +diff --git a/data/org.gnome.ShellSearchProvider2.xml
> b/data/org.gnome.ShellSearchProvider2.xml
> +index 9502340..8141bc0 100644
> +--- a/data/org.gnome.ShellSearchProvider2.xml
> b/data/org.gnome.ShellSearchProvider2.xml
> +@@ -83,5 +83,11 @@
> +
> +
> +
> ++
> ++
> ++
> +
> +
> +diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
> +index 3b847af..9245745 100644
> +--- a/js/ui/remoteSearch.js
> b/js/ui/remoteSearch.js
> +@@ -31,6 +31,7 @@ const SearchProviderIface = `
> +
> +
> +
> ++
> +
> + `;
> +
> +@@ -59,6 +60,7 @@ const SearchProvider2Iface = `
> +
> +
> +
> ++
> +
> + `;
> +
> +@@ -312,6 +314,19 @@ var RemoteSearchProvider = new Lang.Class({
> + cancellable);
> + },
> +
> ++XUbuntuCancel(cancellable, callback) {
> ++this.proxy.XUbuntuCancelRemote((results, error) => {
> ++if (error &&
> ++!error.matches(Gio.DBusError,
> Gio.DBusError.UNKNOWN_METHOD) &&
> ++!error.matches(Gio.IOErrorEnum,
> Gio.IOErrorEnum.CANCELLED)) {
> ++log('Received error from DBus search provider %s during
> XUbuntuCancel: %s'.format(this.id, String(error)));
> ++} else if (callback && !error) {
> ++callback();
> ++}
> ++},
> ++cancellable);
> ++},
> ++
> + activateResult(id) {
> + this.proxy.ActivateResultRemote(id);
> + },
> +diff --git a/js/ui/search.js b/js/ui/search.js
> +index dd4bfad..629664e 100644
> +--- a/js/ui/search.js
> b/js/ui/search.js
> +@@ -225,7 +225,9 @@ var SearchResultsBase = new Lang.Class({
> + this._cancellable.cancel();
> + this._cancellable.reset();
> +
> ++this.provider.resultsMetasInProgress = true;
> + this.provider.getResultMetas(metasNeeded, metas => {
> ++this.provider.resultsMetasInProgress =
> this._cancellable.is_cancelled();
Sounds good to me.
nitpick: alignement to be fixed!
> + if (metas.length != metasNeeded.length) {
> + if (!this._cancellable.is_cancelled())
> + log(`Wrong number of result metas returned by
> search provider ${this.provider.id}` +
> +@@ -450,6 +452,10 @@ var SearchResults = new Lang.Class({
> +
> + this._searchTimeoutId = 0;
> + this._cancellable = new Gio.Cancellable();
> ++this._searchCancelCancellable = new Gio.Cancellable();
> ++this._cancellable.connect(() => {
> ++this._cancelSearchProviderRequest();
> ++});
> +
> + this._registerProvider(new AppDisplay.AppSearchProvider());
> + this._reloadRemoteProviders();
> +@@ -491,11 +497,32 @@ var SearchResults = new Lang.Class({
> + }
> + },
> +
> ++_cancelSearchProviderRequest() {
> ++if (this._terms.length != 0 || this._searchCancelTimeoutId > 0)
> ++return;
> ++
> ++this._searchCancelTimeoutId =
> GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
> ++this._providers.forEach(provider => {
> ++if (provider.isRemoteProvider &&
>
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/354050 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
