- Fix commonly reported NautilusDirectory crash

This commit is contained in:
Alexander Larsson 2006-11-13 13:05:43 +00:00
parent b381e868a7
commit 5c42a99783
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- 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;
}

View File

@ -24,7 +24,7 @@
Name: nautilus Name: nautilus
Summary: Nautilus is a file manager for GNOME. Summary: Nautilus is a file manager for GNOME.
Version: 2.16.2 Version: 2.16.2
Release: 4%{?dist} Release: 5%{?dist}
License: GPL License: GPL
Group: User Interface/Desktops Group: User Interface/Desktops
Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2
@ -90,6 +90,8 @@ Patch2: nautilus-2.15.2-format.patch
Patch3: background-no-delay.patch Patch3: background-no-delay.patch
Patch5: nautilus-2.16.2-selinux.patch Patch5: nautilus-2.16.2-selinux.patch
Patch7: nautilus-2.16.2-icons-overlap-revert.patch Patch7: nautilus-2.16.2-icons-overlap-revert.patch
# From upstream
Patch8: nautilus-2.16.2-directory-unref-crash.patch
%description %description
Nautilus integrates access to files, applications, media, Nautilus integrates access to files, applications, media,
@ -123,6 +125,7 @@ for writing nautilus extensions.
%patch3 -p1 -b .no-delay %patch3 -p1 -b .no-delay
%patch5 -p1 -b .selinux %patch5 -p1 -b .selinux
%patch7 -p1 -b .icons-overlap-revert %patch7 -p1 -b .icons-overlap-revert
%patch8 -p1 -b .directory-unref-crash
%build %build
@ -216,6 +219,9 @@ scrollkeeper-update
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Mon Nov 13 2006 Alexander Larsson <alexl@redhat.com> - 2.16.2-5.fc7
- Fix commonly reported NautilusDirectory crash
* Wed Nov 8 2006 Alexander Larsson <alexl@redhat.com> - 2.16.2-4.fc7 * Wed Nov 8 2006 Alexander Larsson <alexl@redhat.com> - 2.16.2-4.fc7
- Revert upstream icon placement patch as it seems broken - Revert upstream icon placement patch as it seems broken