rpms/nautilus/FC-6 nautilus-2.16.2-directory-unref-crash.patch, NONE, 1.1 nautilus.spec, 1.128, 1.129

[fedora-cvs-commits at redhat.com]

Author: alexl

Update of /cvs/dist/rpms/nautilus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21214

Modified Files:
	nautilus.spec 
Added Files:
	nautilus-2.16.2-directory-unref-crash.patch 
Log Message:
* Mon Nov 13 2006 Alexander Larsson <alexl at redhat.com> - 2.16.2-5.fc6
- Fix commonly reported NautilusDirectory crash



nautilus-2.16.2-directory-unref-crash.patch:
 nautilus-directory-async.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE nautilus-2.16.2-directory-unref-crash.patch ---
--- nautilus-2.16.2/libnautilus-private/nautilus-directory-async.c.crash	2006-11-13 12:43:34.000000000 +0100
+++ nautilus-2.16.2/libnautilus-private/nautilus-directory-async.c	2006-11-13 12:45:21.000000000 +0100
@@ -1858,6 +1858,8 @@
 	directory = NAUTILUS_DIRECTORY (callback_data);
 	directory->details->call_ready_idle_id = 0;
 
+	nautilus_directory_ref (directory);
+	
 	callback = NULL;
 	while (1) {
 		/* Check if any callbacks are non-active and call them if they are. */
@@ -1886,6 +1888,8 @@
 	update_metadata_monitors (directory);
 
 	nautilus_directory_async_state_changed (directory);
+
+	nautilus_directory_unref (directory);
 	
 	return FALSE;
 }


Index: nautilus.spec
===================================================================
RCS file: /cvs/dist/rpms/nautilus/FC-6/nautilus.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- nautilus.spec	8 Nov 2006 10:35:55 -0000	1.128
+++ nautilus.spec	13 Nov 2006 12:11:39 -0000	1.129
@@ -19,7 +19,7 @@
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME.
 Version: 	2.16.2
-Release:	3%{?dist}
+Release:	5%{?dist}
 License: 	GPL
 Group:          User Interface/Desktops
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@@ -82,6 +82,8 @@
 Patch5:		nautilus-2.16.2-selinux.patch
 Patch6:		nautilus-2.16.0-dynamic-beagle.patch
 Patch7:		nautilus-2.16.2-icons-overlap-revert.patch
+# From upstream
+Patch8:		nautilus-2.16.2-directory-unref-crash.patch
 
 %description
 Nautilus integrates access to files, applications, media,
@@ -116,6 +118,7 @@
 %patch5 -p1 -b .selinux
 %patch6 -p1 -b .dynamic-beagle
 %patch7 -p1 -b .icons-overlap-revert
+%patch8 -p1 -b .directory-unref-crash
 
 %build
 
@@ -210,6 +213,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 13 2006 Alexander Larsson <alexl at redhat.com> - 2.16.2-5.fc6
+- Fix commonly reported NautilusDirectory crash
+
 * Wed Nov  8 2006 Alexander Larsson <alexl at redhat.com> - 2.16.2-3.fc6
 - Revert upstream icon placement patch as it seems broken