From 4245746db16a2d3ad6c9b0122fb52e1696648fff Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Oct 20 2008 13:58:24 +0000
Subject: - Update to 2.24.1


---

diff --git a/.cvsignore b/.cvsignore
index 5a691e2..87392e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nautilus-2.24.0.tar.bz2
+nautilus-2.24.1.tar.bz2
diff --git a/description-leak.patch b/description-leak.patch
deleted file mode 100644
index 25ce04d..0000000
--- a/description-leak.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c
---- nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c.description-leak	2008-09-20 23:57:57.000000000 -0400
-+++ nautilus-2.23.92/libnautilus-private/nautilus-open-with-dialog.c	2008-09-20 23:58:29.000000000 -0400
-@@ -907,10 +907,10 @@ set_uri_and_type (NautilusOpenWithDialog
- 		description = g_content_type_get_description (mime_type);
- 
- 		if (description == NULL) {
--			description = _("Unknown");
-+			description = g_strdup (_("Unknown"));
- 		}
- 
--		dialog->details->type_description = g_strdup (description);
-+		dialog->details->type_description = description;
- 	}
- 	g_free (extension);
- 
diff --git a/filesystem-id-cmp.patch b/filesystem-id-cmp.patch
deleted file mode 100644
index 8138fd1..0000000
--- a/filesystem-id-cmp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp nautilus-2.23.92/libnautilus-private/nautilus-file.c
---- nautilus-2.23.92/libnautilus-private/nautilus-file.c.filesystem-id-cmp	2008-09-20 20:52:38.000000000 -0400
-+++ nautilus-2.23.92/libnautilus-private/nautilus-file.c	2008-09-20 20:53:20.000000000 -0400
-@@ -1836,7 +1836,7 @@ update_info_internal (NautilusFile *file
- 	}
- 
- 	filesystem_id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILESYSTEM);
--	if (eel_strcmp (file->details->filesystem_id, filesystem_id) != 0) {
-+	if (eel_strcmp (eel_ref_str_peek (file->details->filesystem_id), filesystem_id) != 0) {
- 		changed = TRUE;
- 		eel_ref_str_unref (file->details->filesystem_id);
- 		file->details->filesystem_id = eel_ref_str_get_unique (filesystem_id);
diff --git a/nautilus.spec b/nautilus.spec
index 02be331..0ff624f 100644
--- a/nautilus.spec
+++ b/nautilus.spec
@@ -18,8 +18,8 @@
 
 Name:		nautilus
 Summary:        Nautilus is a file manager for GNOME
-Version: 	2.24.0
-Release:	3%{?dist}
+Version: 	2.24.1
+Release:	1%{?dist}
 License: 	GPLv2+
 Group:          User Interface/Desktops
 Source: 	http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
@@ -99,12 +99,6 @@ Patch15:	nautilus-2.22.0-treeview-xds-dnd.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
 Patch17:	nautilus-filetype-symlink-fix.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=553073
-Patch23:	filesystem-id-cmp.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=553084
-Patch24: 	description-leak.patch
-
 %description
 Nautilus integrates access to files, applications, media,
 Internet-based resources and the Web. Nautilus delivers a dynamic and
@@ -143,8 +137,6 @@ for writing nautilus extensions.
 %patch10 -p0 -b .gvfs-desktop-key
 %patch15 -p1 -b .xds
 %patch17 -p0 -b .symlink
-%patch23 -p1 -b .filesystem-id-cmp
-%patch24 -p1 -b .description-leak
 
 %build
 
@@ -273,6 +265,9 @@ fi
 
 
 %changelog
+* Mon Oct 20 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.24.1-1
+- Update to 2.24.1
+
 * Tue Oct 14 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.0-3
 - Remove debug flags
 
diff --git a/sources b/sources
index 64bf04a..b1d7ded 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b80c29aaefa3a22cdf58f644ef3019d0  nautilus-2.24.0.tar.bz2
+ccb5497397dfba46569b6dd1d2f41cef  nautilus-2.24.1.tar.bz2