--- a/base-specs/nautilus.spec	Thu Jan 03 22:33:38 2008 +0000
+++ b/base-specs/nautilus.spec	Fri Jan 04 01:43:57 2008 +0000
@@ -125,8 +125,8 @@
 %endif
 ##%patch1 -p1
 %patch2 -p1
-##%patch3 -p1
-##%patch4 -p1
+%patch3 -p1
+%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 ##%patch7 -p1
@@ -231,6 +231,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jan 03 2007 - [email protected]
+- Add back patch 3 and 4 after reworking them so they apply to new
+  nautilus version.
 * Sun Dec 30 2007 - [email protected]
 - Bump to 2.21.1. Hack: Disable most patches to try to get it to build.
 * Fri Nov 23 2007 - [email protected]

--- a/patches/nautilus-03-ftp-rename.diff	Thu Jan 03 22:33:38 2008 +0000
+++ b/patches/nautilus-03-ftp-rename.diff	Fri Jan 04 01:43:57 2008 +0000
@@ -1,24 +1,24 @@
---- nautilus-2.10.1/libnautilus-private/nautilus-bookmark.c	2004-11-29 22:09:31.000000000 +0530
-+++ nautilus-2.10.1-new/libnautilus-private/nautilus-bookmark.c	2005-05-26 14:08:54.670049048 +0530
+--- nautilus-2.21.1/libnautilus-private/nautilus-bookmark.c-orig	2008-01-03 18:30:24.952532000 -0600
++++ nautilus-2.21.1/libnautilus-private/nautilus-bookmark.c	2008-01-03 18:46:56.302033000 -0600
 @@ -25,6 +25,7 @@
  #include <config.h>
  #include "nautilus-bookmark.h"
  
 +#include "nautilus-file-private.h"
- #include "nautilus-icon-factory.h"
+ #include "nautilus-file.h"
  #include <eel/eel-gdk-pixbuf-extensions.h>
  #include <eel/eel-gtk-extensions.h>
-@@ -534,10 +535,18 @@ nautilus_bookmark_uri_known_not_to_exist
+@@ -605,10 +606,18 @@ nautilus_bookmark_uri_known_not_to_exist
  {
  	char *path_name;
  	gboolean exists;
 +	NautilusFile *file;
  
  	/* Convert to a path, returning FALSE if not local. */
- 	path_name = gnome_vfs_get_local_path_from_uri (bookmark->details->uri);
+ 	path_name = g_file_get_path (bookmark->details->location);
  	if (path_name == NULL) {
 +		/* It's a remote file, check for its existence. */
-+		file = nautilus_file_get_existing (bookmark->details->uri);
++		file = nautilus_file_get_existing (bookmark->details->location);
 +		if (file == NULL) {
 +			/* Remote file does not exist, so return TRUE */
 +			return TRUE;

--- a/patches/nautilus-04-execute-shellscript.diff	Thu Jan 03 22:33:38 2008 +0000
+++ b/patches/nautilus-04-execute-shellscript.diff	Fri Jan 04 01:43:57 2008 +0000
@@ -1,6 +1,6 @@
---- /usr/src/redhat/BUILD/nautilus-2.10.1/libnautilus-private/nautilus-file.c	2005-06-14 12:38:27.842030744 +0530
-+++ nautilus-2.10.1/libnautilus-private/nautilus-file.c	2005-06-14 12:34:00.415720000 +0530
-@@ -5250,10 +5250,31 @@ nautilus_file_get_file_info_result (Naut
+--- nautilus-2.21.1/libnautilus-private/nautilus-file.c-orig	2008-01-03 18:35:19.308752000 -0600
++++ nautilus-2.21.1/libnautilus-private/nautilus-file.c	2008-01-03 18:38:31.413662000 -0600
+@@ -5819,10 +5819,31 @@ nautilus_file_get_file_info_error (Nauti
  gboolean
  nautilus_file_contains_text (NautilusFile *file)
  {
@@ -18,13 +18,13 @@
  		return FALSE;
  	}
  
-+	if (file->details->info == NULL || file->details->info->mime_type == NULL) {
++	if (file->details == NULL || file->details->mime_type == NULL) {
 +		return FALSE;
 +	}
 +
 +	it = script_mime_types;
 +	while (*it) {
-+		if (! strcmp (file->details->info->mime_type, *it))
++		if (! strcmp (file->details->mime_type, *it))
 +			return TRUE;
 +		it ++;
 +	}