From 46f955726f384b95e235b01069c0e997637a166a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:11:33 +0000 Subject: import gnome-documents-3.14.3-3.el7 --- diff --git a/SOURCES/gnome-documents-prevent-nested-collections.patch b/SOURCES/gnome-documents-prevent-nested-collections.patch new file mode 100644 index 0000000..01a3be5 --- /dev/null +++ b/SOURCES/gnome-documents-prevent-nested-collections.patch @@ -0,0 +1,25 @@ +From 43217734c4b01e894bd1d4efa19d9a07bbb2807c Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Wed, 15 Jun 2016 12:19:49 +0200 +Subject: [PATCH] selections: Prevent nested collections + +https://bugzilla.redhat.com/show_bug.cgi?id=958690 +--- + src/selections.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/selections.js b/src/selections.js +index 7c1b47d9983d..cec718b9a793 100644 +--- a/src/selections.js ++++ b/src/selections.js +@@ -841,6 +841,7 @@ const SelectionToolbar = new Lang.Class({ + showShare = false; + + showTrash &= doc.canTrash(); ++ showCollection &= !doc.collection; + showPrint &= !doc.collection; + })); + +-- +2.5.5 + diff --git a/SPECS/gnome-documents.spec b/SPECS/gnome-documents.spec index cb9dffe..a5e2a2e 100644 --- a/SPECS/gnome-documents.spec +++ b/SPECS/gnome-documents.spec @@ -3,7 +3,7 @@ Name: gnome-documents Version: 3.14.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A document manager application for GNOME License: GPLv2+ @@ -12,6 +12,8 @@ Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version # https://bugzilla.redhat.com/show_bug.cgi?id=1057160 Patch0: gnome-documents-show-a-back-button-while-loading.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=958690 +Patch1: gnome-documents-prevent-nested-collections.patch Patch100: translations.patch @@ -44,6 +46,7 @@ the Documents directory. %prep %setup -q %patch0 -p1 -b .back-button-loading +%patch1 -p1 -b .nested-collections %patch100 -p1 -b .translations %build @@ -91,6 +94,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gnome-shell/search-providers/org.gnome.Documents.search-provider.ini %changelog +* Wed Jun 15 2016 Debarshi Ray - 3.14.3-3 +- Prevent nested collections + Resolves: #958690 + * Wed May 20 2015 Debarshi Ray - 3.14.3-2 - Show a back button when loading Resolves: #1057160