--- a/ChangeLog	Mon Apr 07 14:52:53 2008 +0000
+++ b/ChangeLog	Mon Apr 07 16:46:33 2008 +0000
@@ -1,3 +1,8 @@
+2008-04-07  Stephen Browne  <[email protected]>
+
+	* base-specs/nautilus.spec: reenable patch 3
+	* patches/nautilus-03-ftp-rename.diff: rework
+
 2008-04-07  Damien Carbery <[email protected]>
 
 	* SUNWgnome-desktop-prefs.spec: Change OpenGL check to only happen on

--- a/base-specs/nautilus.spec	Mon Apr 07 14:52:53 2008 +0000
+++ b/base-specs/nautilus.spec	Mon Apr 07 16:46:33 2008 +0000
@@ -30,7 +30,7 @@
 #owner:stephen date:2005-02-25 type:bug bugster:5011528
 Patch2:       nautilus-02-desktop-cluttered-icons.diff
 #owner:stephen date:2005-05-07 type:bug bugster:6238031 bugzilla:170761
-##Patch3:       nautilus-03-ftp-rename.diff
+Patch3:       nautilus-03-ftp-rename.diff
 #owner:stephen date:2004-11-10 type:bug bugster:6174222
 Patch4:      nautilus-04-execute-shellscript.diff
 #owner:stephen date:2005-06-17 type:branding
@@ -129,7 +129,7 @@
 %endif
 %patch1 -p1
 %patch2 -p1
-##%patch3 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1

--- a/patches/nautilus-03-ftp-rename.diff	Mon Apr 07 14:52:53 2008 +0000
+++ b/patches/nautilus-03-ftp-rename.diff	Mon Apr 07 16:46:33 2008 +0000
@@ -1,5 +1,6 @@
---- 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
+diff -urN naut.orig/libnautilus-private/nautilus-bookmark.c naut.new/libnautilus-private/nautilus-bookmark.c
+--- naut.orig/libnautilus-private/nautilus-bookmark.c	2008-04-07 13:33:19.366080000 +0100
++++ naut.new/libnautilus-private/nautilus-bookmark.c	2008-04-07 13:55:49.482282000 +0100
 @@ -25,6 +25,7 @@
  #include <config.h>
  #include "nautilus-bookmark.h"
@@ -8,22 +9,21 @@
  #include "nautilus-file.h"
  #include <eel/eel-gdk-pixbuf-extensions.h>
  #include <eel/eel-gtk-extensions.h>
-@@ -605,10 +606,18 @@ nautilus_bookmark_uri_known_not_to_exist
+@@ -607,9 +608,17 @@
  {
  	char *path_name;
  	gboolean exists;
 +	NautilusFile *file;
  
  	/* Convert to a path, returning FALSE if not local. */
- 	path_name = g_file_get_path (bookmark->details->location);
- 	if (path_name == NULL) {
-+		/* It's a remote file, check for its existence. */
+ 	if (!g_file_is_native (bookmark->details->location)) {
++		/* It's a remote file, check for its existance */
 +		file = nautilus_file_get_existing (bookmark->details->location);
 +		if (file == NULL) {
-+			/* Remote file does not exist, so return TRUE */
++			/* Remote files does not exist, so return TRUE */
 +			return TRUE;
-+		}
++			}
 +		nautilus_file_unref (file);
  		return FALSE;
  	}
- 
+ 	path_name = g_file_get_path (bookmark->details->location);