[nautilus/f20] Fix 1029670

[Matthias Clasen]

commit e51f280c89ccf1fc20d3e1d664463fb0ae09e4f1
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon May 5 17:23:51 2014 -0400

    Fix 1029670

 ...-Add-missing-unref-for-NautilusFile-used-.patch |   29 ++++++++++++++++++++
 nautilus.spec                                      |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-application-Add-missing-unref-for-NautilusFile-used-.patch b/0001-application-Add-missing-unref-for-NautilusFile-used-.patch
new file mode 100644
index 0000000..d71a4f0
--- /dev/null
+++ b/0001-application-Add-missing-unref-for-NautilusFile-used-.patch
@@ -0,0 +1,29 @@
+From 447aa9262d4c169f174222cb6e43eed654ea206f Mon Sep 17 00:00:00 2001
+From: Robert Ancell <robert.ancell at canonical.com>
+Date: Fri, 2 May 2014 10:26:44 +1200
+Subject: [PATCH] application: Add missing unref for NautilusFile used in
+ network connections.
+
+This was introduced in commit 95d42ea01f7f9c60210b415554e7bbf6f4e1b334 and released in 3.5.91.
+The error meant that when a network location was disconnected the next time you connected to it you would get the old NautilusFile object that was marked as "gone" and hit an assertion.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=708282
+---
+ src/nautilus-application.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index d385c52..7137d5e 100644
+--- a/src/nautilus-application.c
++++ b/src/nautilus-application.c
+@@ -613,6 +613,7 @@ go_to_server_cb (NautilusWindow *window,
+ 			g_bookmark_file_to_file (bookmarks, filename, NULL);
+ 		}
+ 
++		nautilus_file_unref (file);
+ 		g_free (filename);
+ 		g_bookmark_file_free (bookmarks);
+ 
+-- 
+1.9.0
+
diff --git a/nautilus.spec b/nautilus.spec
index 8fc8118..27b2114 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -10,7 +10,7 @@
 Name:           nautilus
 Summary:        File manager for GNOME
 Version:        3.10.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        GPLv2+
 Group:          User Interface/Desktops
 Source:         http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz
@@ -21,6 +21,7 @@ Patch0: 0001-Format-item-for-volumes-disappeared.patch
 Patch1: 0001-nautilus-window-Check-for-valid-location-entry-widge.patch
 # upstream (3-10 branch) 692b8824bd, crasher fix, RHBZ #1013272
 Patch2: 0002-NautilusFile-fix-crash-in-modify_link_hash_table.patch
+Patch3: 0001-application-Add-missing-unref-for-NautilusFile-used-.patch
 
 URL:            http://projects.gnome.org/nautilus/
 Requires:       redhat-menus
@@ -99,6 +100,7 @@ for developing nautilus extensions.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 #%patch4 -p1 -b .selinux
 
@@ -176,6 +178,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
 
 %changelog
+* Mon May  5 2014 Matthias Clasen <mclasen at redhat.com> - 3.10.1-4
+- backport a crash fix from upstream (#1029670)
+
 * Thu Feb 06 2014 Adam Williamson <awilliam at redhat.com> - 3.10.1-3
 - backport a couple of crasher fixes from upstream, fixes RHBZ #1013272