gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-12 20:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed mistake in recent bug fix.

Browse source
This commit is contained in:
John Sullivan 2000-03-10 02:44:52 +00:00
parent 0d911a35c0
commit 30433daf59
4 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog-20000414
View file

@ -1,3 +1,11 @@
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-file.c:
(nautilus_file_unref): Got this fix wrong last time, causing
GTK-CRITICALs when deleting files. Remember file->is_gone
before unreffing directory since you can't test possibly-destroyed
file afterward.
2000-03-09 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-directory-private.h:

12
libnautilus-extensions/nautilus-file.c
View file

@ -148,6 +148,8 @@ nautilus_file_ref (NautilusFile *file)
void
nautilus_file_unref (NautilusFile *file)
{
gboolean goner;
g_return_if_fail (file != NULL);
g_assert (file->ref_count != 0);
@ -158,11 +160,17 @@ nautilus_file_unref (NautilusFile *file)
return;
}
goner = file->is_gone;
/* No references left, so it's time to release our hold on the directory. */
if (file->is_gone) {
gtk_object_unref (GTK_OBJECT (file->directory));
if (goner) {
/* Files that were deleted aren't referenced by the directory,
* need to free it explicitly.
*/
nautilus_file_free (file);
}
gtk_object_unref (GTK_OBJECT (file->directory));
}
void

12
libnautilus-private/nautilus-file.c
View file

@ -148,6 +148,8 @@ nautilus_file_ref (NautilusFile *file)
void
nautilus_file_unref (NautilusFile *file)
{
gboolean goner;
g_return_if_fail (file != NULL);
g_assert (file->ref_count != 0);
@ -158,11 +160,17 @@ nautilus_file_unref (NautilusFile *file)
return;
}
goner = file->is_gone;
/* No references left, so it's time to release our hold on the directory. */
if (file->is_gone) {
gtk_object_unref (GTK_OBJECT (file->directory));
if (goner) {
/* Files that were deleted aren't referenced by the directory,
* need to free it explicitly.
*/
nautilus_file_free (file);
}
gtk_object_unref (GTK_OBJECT (file->directory));
}
void

12
libnautilus/nautilus-file.c
View file

@ -148,6 +148,8 @@ nautilus_file_ref (NautilusFile *file)
void
nautilus_file_unref (NautilusFile *file)
{
gboolean goner;
g_return_if_fail (file != NULL);
g_assert (file->ref_count != 0);
@ -158,11 +160,17 @@ nautilus_file_unref (NautilusFile *file)
return;
}
goner = file->is_gone;
/* No references left, so it's time to release our hold on the directory. */
if (file->is_gone) {
gtk_object_unref (GTK_OBJECT (file->directory));
if (goner) {
/* Files that were deleted aren't referenced by the directory,
* need to free it explicitly.
*/
nautilus_file_free (file);
}
gtk_object_unref (GTK_OBJECT (file->directory));
}
void