[Merge] lp:~khurshid-alam/unity-settings-daemon/sharing-plugin into lp:unity-settings-daemon
Khurshid Alam has proposed merging
lp:~khurshid-alam/unity-settings-daemon/sharing-plugin into
lp:unity-settings-daemon.
Commit message:
Add sharing plugin
we are importing sharing panel from gnome-control-center as the old
screen-sharing panel does not work anymore due to a gsettings key removal from
vino. Our new sharing panel will use this plugin. This plugin is a direct port
from gnome-settings-daemon 3.22.
Requested reviews:
Marco Trevisan (Treviño) (3v1n0)
Related bugs:
Bug #1741027 in unity-control-center (Ubuntu): "[FFE] Screen sharing panels
abort using an non-existent vino gsettings key"
https://bugs.launchpad.net/ubuntu/+source/unity-control-center/+bug/1741027
For more details, see:
https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/sharing-plugin/+merge/355887
PPA: unity7maintainers/unity7-desktop
Testing:
https://community.ubuntu.com/t/testing-of-sharing-panel-in-u-c-c-bionic/4215
The related control center branch is
https://code.launchpad.net/~khurshid-alam/unity-control-center/sharing-panel
--
Your team Unity Settings Daemon Development Team is subscribed to branch
lp:unity-settings-daemon.
=== modified file 'configure.ac'
--- configure.ac 2017-03-24 03:49:07 +
+++ configure.ac 2018-09-30 12:23:49 +
@@ -58,6 +58,7 @@
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION=3.7.2.1
XRANDR_REQUIRED_VERSION=1.3
XEXT_REQUIRED_VERSION=1.1
+NM_REQUIRED_VERSION=1.0
EXTRA_COMPILE_WARNINGS(yes)
@@ -376,6 +377,24 @@
AC_SUBST(NSS_DATABASE)
+dnl ---
+dnl Sharing plugin
+dnl ---
+
+AC_ARG_ENABLE(network-manager,
+AS_HELP_STRING([--disable-network-manager],
+ [Disable NetworkManager support]),
+enable_network_manager=$enableval,
+enable_network_manager=yes)
+
+if test "x$enable_network_manager" = "xyes" ; then
+NM_MODULE="libnm >= $NM_REQUIRED_VERSION"
+AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
+else
+NM_MODULE=
+fi
+
+PKG_CHECK_MODULES(SHARING, gio-2.0 $NM_MODULE)
# ---
# Enable Profiling
@@ -497,6 +516,7 @@
plugins/orientation/Makefile
plugins/remote-display/Makefile
plugins/screensaver-proxy/Makefile
+plugins/sharing/Makefile
plugins/smartcard/Makefile
plugins/sound/Makefile
plugins/updates/Makefile
@@ -537,6 +557,7 @@
Session tracking: ${SESSION_TRACKING}
LCMS DICT support:${have_new_lcms}
+NetworkManager support: ${enable_network_manager}
IBus support: ${enable_ibus}
Fcitx support:${enable_fcitx}
Libnotify support:${have_libnotify}
=== modified file 'debian/control'
--- debian/control 2018-04-13 18:45:04 +
+++ debian/control 2018-09-30 12:23:49 +
@@ -13,6 +13,7 @@
libdbus-glib-1-dev (>= 0.74),
libglib2.0-dev (>= 2.35.3),
libgtk-3-dev (>= 3.7.8),
+ libnm-dev (>= 1.0) [linux-any],
libnotify-dev (>= 0.7.0),
libxt-dev,
libxi-dev,
=== modified file 'debian/rules'
--- debian/rules 2018-04-13 18:45:04 +
+++ debian/rules 2018-09-30 12:23:49 +
@@ -8,7 +8,7 @@
DEB_DH_MAKESHLIBS_ARGS_ALL += -X/usr/lib/unity-settings-daemon-1.0
DEB_CONFIGURE_SCRIPT := ./autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-packagekit --enable-ibus --enable-fcitx
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-packagekit --enable-ibus --enable-fcitx --enable-network-manager
build/unity-settings-daemon::
gcc -o gnome-settings-daemon/gnome-update-wallpaper-cache debian/gnome-update-wallpaper-cache.c `pkg-config --cflags --libs glib-2.0 gdk-3.0 gdk-x11-3.0 gio-2.0 gnome-desktop-3.0`
=== modified file 'plugins/Makefile.am'
--- plugins/Makefile.am 2017-03-24 03:49:07 +
+++ plugins/Makefile.am 2018-09-30 12:23:49 +
@@ -16,6 +16,7 @@
mouse \
remote-display \
screensaver-proxy \
+ sharing \
sound \
xrandr \
xsettings \
=== added directory 'plugins/sharing'
=== added file 'plugins/sharing/Makefile.am'
--- plugins/sharing/Makefile.am 1970-01-01 00:00:00 +
+++ plugins/sharing/Makefile.am 2018-09-30 12:23:49 +
@@ -0,0 +1,49 @@
+plugin_name = sharing
+
+plugin_LTLIBRARIES = libsharing.la
+
+libsharing_la_SOURCES = \
+ gsd-sharing-manager.c \
+ gsd-sharing-manager.h \
+ gsd-sharing-enums.h \
+ gsd-sharing-plugin.c
+
+libsharing_la_CPPFLAGS = \
+ -I$(top_srcdir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ $(AM_CPPFLAGS)
+
+libsharing_la_CFLAGS = \
+ -I$(top_srcdir)/plugins/common \
+ $(SHARING_CFLAGS) \
+ $(PLUGIN_CFLAGS) \
+ $(SETTINGS_PLUGIN_CFLAGS) \
+ $(AM_CFLAGS)
+
+libsharing_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
+
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master with ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1713581 in nautilus (Ubuntu): "nautilus crashed with SIGSEGV in g_type_check_instance_is_fundamentally_a()" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1713581 Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider performs expensive operation" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826 Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in is_recursive_search (search-engine)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355858 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 0d739a6..a68c9a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,8 @@ nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch: shell-search-provider: implement XUbuntuCancel to request pending search cancellation from gnome-shell (LP: #1756826) - <<< debian/changelog + -- Marco Trevisan (Treviño) Thu, 30 Aug 2018 18:15:24 -0500 nautilus (1:3.26.4-0ubuntu2) cosmic; urgency=medium @@ -43,6 +43,9 @@ nautilus (1:3.26.4-0ubuntu2) cosmic; urgency=medium nautilus (1:3.26.4-0ubuntu1) cosmic; urgency=medium === + * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: +- Fix remote filesystem check on file during search (LP: #1795028) + -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 18:03:14 +0200 nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index f80997f..193c6e2 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -512,7 +512,11 @@ index 000..bcd73b9 + +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c +<<< debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index 3a0c9d4..793b831 100644 +=== +index 28863f7..a4c6007 100644 +>>> debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -30,11 +30,13 @@ diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index e6185da..8e3d059 100644 --- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch +++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch @@ -49,7 +49,11 @@ index 19316e8..9bb5460 100644 /* Now send out the changed and added signals for existing file objects. */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c +<<< debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index 63413a6..9416214 100644 +=== +index 28b5a13..7886d1f 100644 +>>> debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -34,6 +34,7 @@ diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 91a7ec0..1135ad8 100644 --- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch +++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch @@ -678,7 +678,11 @@ index 000..ac5e3fc + +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c +<<< debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 793b831..902d483 100644 +=== +index a4c6007..475a432 100644 +>>> debian/patches/0018-search-engine-add-locate-based-search-engine.patch --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -29,6 +29,7 @@ diff --git a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch index fddae3e..76b455b 100644 --- a/debian/patches/query-add
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in is_recursive_search (search-engine)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355857 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index f9868fd..1a49d56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0ubuntu5) UNRELEASED; urgency=medium + + * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: +- Fix remote filesystem check on file during search (LP: #1795028) + + -- Marco Trevisan (Treviño) Fri, 28 Sep 2018 19:06:46 +0200 + nautilus (1:3.26.4-0ubuntu4) cosmic; urgency=medium [ Marco Trevisan (Treviño) ] diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index f80997f..20e597c 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -512,7 +512,7 @@ index 000..bcd73b9 + +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 3a0c9d4..793b831 100644 +index 28863f7..a4c6007 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -30,11 +30,13 @@ diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index e6185da..ad248da 100644 --- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch +++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch @@ -49,7 +49,7 @@ index 19316e8..9bb5460 100644 /* Now send out the changed and added signals for existing file objects. */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 63413a6..9416214 100644 +index 28b5a13..7886d1f 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -34,6 +34,7 @@ diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 91a7ec0..158b448 100644 --- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch +++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch @@ -678,7 +678,7 @@ index 000..ac5e3fc + +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 793b831..902d483 100644 +index a4c6007..475a432 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -29,6 +29,7 @@ diff --git a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch index fddae3e..3c89693 100644 --- a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch +++ b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch @@ -198,7 +198,7 @@ index b567611..b165d63 100644 + #endif /* NAUTILUS_FILE_UTILITIES_H */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 3f6a69f..63413a6 100644 +index 22ea199..e30d791 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -4975,6 +4975,29 @@ nautilus_file_get_filesystem_type (NautilusFile *file) diff --git a/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch new file mode 100644 index 000..1b7f874 --- /dev/null +++ b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch @@ -0,0 +1,127 @@ +From: Ernestas Kulik +Date: Fri, 14 Sep 2018 12:52:11 +0200 +Subject: search-engine: Query file system to determine remoteness + +Querying the file cache in is_recursive_search() does not guarantee that +the file system field will be populated with a value, and somehow +results in data races, in turn resulting in random crashes/file list +corruption. + +Hopefully fixes https://gitlab.gnome.org/GNOME/nautilus/issues/640, +closes https://gitlab.gnome.org/GNOME/nautilus/issues/632 and resolves +https://gitlab.gnome.org/GNOME/nautilus/issues/602 + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 +Applied-Upstream: yes, 3.30.1, https://gitlab.gnome.org/GNOME/nautilus/commit/62ba6d83
[Merge] ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Khurshid Alam has proposed merging ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. Commit message: Re-enable background plugin by default. Gnome-settings-daemon doesn't use that key anymore (They are auto started by desktop files), But unity-settings-daemon now requires it to be enabled by default. Fixes LP: #1795145 Requested reviews: Iain Lane (laney) Related bugs: Bug #1795145 in ubuntu-settings (Ubuntu): "Turn on background plugin by default (Ubuntu 18.10)" https://bugs.launchpad.net/ubuntu/+source/ubuntu-settings/+bug/1795145 For more details, see: https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/355874 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override index a2852e5..8291381 100644 --- a/debian/ubuntu-settings.gsettings-override +++ b/debian/ubuntu-settings.gsettings-override @@ -137,7 +137,7 @@ antialiasing = 'rgba' active = false [org.gnome.settings-daemon.plugins.background:ubuntu] -active = false +active = true [org.gnome.software:ubuntu] first-run = false -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~fitojb/ubiquity-slideshow-ubuntu/logo-refresh into lp:ubiquity-slideshow-ubuntu
I would love a review, please. -- https://code.launchpad.net/~fitojb/ubiquity-slideshow-ubuntu/logo-refresh/+merge/353025 Your team Ubuntu Desktop is requested to review the proposed merge of lp:~fitojb/ubiquity-slideshow-ubuntu/logo-refresh into lp:ubiquity-slideshow-ubuntu. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355857 -- 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/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355858 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~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/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic with ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in is_recursive_search (search-engine)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355859 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 312bb43..5e63a62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch: shell-search-provider: implement XUbuntuCancel to request pending search cancellation from gnome-shell (LP: #1756826) + * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: +- Fix remote filesystem check on file during search (LP: #1795028) -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 18:03:14 +0200 diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index f80997f..20e597c 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -512,7 +512,7 @@ index 000..bcd73b9 + +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 3a0c9d4..793b831 100644 +index 28863f7..a4c6007 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -30,11 +30,13 @@ diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index e6185da..ad248da 100644 --- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch +++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch @@ -49,7 +49,7 @@ index 19316e8..9bb5460 100644 /* Now send out the changed and added signals for existing file objects. */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 63413a6..9416214 100644 +index 28b5a13..7886d1f 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -34,6 +34,7 @@ diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 91a7ec0..158b448 100644 --- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch +++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch @@ -678,7 +678,7 @@ index 000..ac5e3fc + +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 793b831..902d483 100644 +index a4c6007..475a432 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -29,6 +29,7 @@ diff --git a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch index fddae3e..3c89693 100644 --- a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch +++ b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch @@ -198,7 +198,7 @@ index b567611..b165d63 100644 + #endif /* NAUTILUS_FILE_UTILITIES_H */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 3f6a69f..63413a6 100644 +index 22ea199..e30d791 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -4975,6 +4975,29 @@ nautilus_file_get_filesystem_type (NautilusFile *file) diff --git a/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch new file mode 100644 index 000..1b7f874 --- /dev/null +++ b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch @@ -0,0 +1,127 @@ +From: Ernestas Kulik +Date: Fri, 14 Sep 2018 12:52:11 +0200 +Subject: search-engine: Query file system to determine remoteness + +Querying the file cache in is_recursive_search() does not guarantee that +the file system field will be populated with a value, and somehow +results in data races, in turn resulting in random crashes/file list +corruption. + +Hopefully fixes https://gitlab.gnome.org/GNOME/nautilus/issues/640, +clos
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355192 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~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 into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve Thanks! -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355857 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
