Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

Proposed by Marco Trevisan (Treviño)
Status: Superseded
Proposed branch: ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Diff against target: 1878 lines (+1357/-93)
16 files modified
NEWS (+3/-0)
debian/changelog (+24/-0)
debian/control.in (+4/-1)
debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch (+88/-46)
debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch (+20/-14)
debian/patches/0018-search-engine-add-locate-based-search-engine.patch (+25/-21)
debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch (+53/-0)
debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch (+25/-0)
debian/patches/git_middle_tab.patch (+78/-0)
debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch (+45/-0)
debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch (+977/-0)
debian/patches/series (+5/-0)
meson.build (+1/-1)
src/nautilus-file.c (+1/-1)
src/nautilus-files-view.c (+7/-8)
src/nautilus-trash-monitor.c (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Desktop Pending
Review via email: mp+349800@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2018-07-20.

Commit message

  * New upstream release: 3.26.3.1
  * debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch,
    debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch,
    debian/patches/0018-search-engine-add-locate-based-search-engine.patch:
    - Follow nautilus settings to search only in current folder (LP: #1767027).
      This doesn't apply to gnome-shell search provider for indexed searches.
  * debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch:
    - Updated to respect upstream requested changes
  * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch:
    - don't crash if selecting a volume that is not mounted (LP: #1764779)

To post a comment you must log in.
Revision history for this message
Amr Ibrahim (amribrahim1987) wrote :

I just have a comment on what upstream did for 3.26.3.1. They reverted two commits, which they see as behavioural changes in a stable release, and that makes sense upstream.

Revert "files-view: Remove new empty folder name suggestion"
https://gitlab.gnome.org/GNOME/nautilus/commit/945c32dec747855047aa9b380d53588c5fcfb57a

Revert "nautilus-file: Don't show thumbnails for the first 2 zoom levels"
https://gitlab.gnome.org/GNOME/nautilus/commit/d62c0899f34665bdc4752ce8b6844328889f4638

But downstream here in Ubuntu, those behaviours were released as part of 18.04 in nautilus 3.26.3 and removing them might be considered a regression in Ubuntu itself. The changes had been introduced in 3.26.3 during the development cycle of Bionic, so technically that counts as an improvement, not as a behavioural change in stable Ubuntu.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Right Amr, I had the same feeling... So pushed a fix for both this and ubuntu/master

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches