patches/nautilus-05-ftp-rename.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8514 5a2ed0a547ed
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8514
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     1
--- nautilus-2.10.1/libnautilus-private/nautilus-bookmark.c	2004-11-29 22:09:31.000000000 +0530
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     2
+++ nautilus-2.10.1-new/libnautilus-private/nautilus-bookmark.c	2005-05-26 14:08:54.670049048 +0530
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     3
@@ -25,6 +25,7 @@
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     4
 #include <config.h>
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     5
 #include "nautilus-bookmark.h"
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     6
 
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     7
+#include "nautilus-file-private.h"
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     8
 #include "nautilus-icon-factory.h"
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     9
 #include <eel/eel-gdk-pixbuf-extensions.h>
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    10
 #include <eel/eel-gtk-extensions.h>
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    11
@@ -534,10 +535,18 @@ nautilus_bookmark_uri_known_not_to_exist
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    12
 {
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    13
 	char *path_name;
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    14
 	gboolean exists;
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    15
+	NautilusFile *file;
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    16
 
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    17
 	/* Convert to a path, returning FALSE if not local. */
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    18
 	path_name = gnome_vfs_get_local_path_from_uri (bookmark->details->uri);
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    19
 	if (path_name == NULL) {
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    20
+		/* It's a remote file, check for its existence. */
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    21
+		file = nautilus_file_get_existing (bookmark->details->uri);
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    22
+		if (file == NULL) {
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    23
+			/* Remote file does not exist, so return TRUE */
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    24
+			return TRUE;
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    25
+		}
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    26
+		nautilus_file_unref (file);
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    27
 		return FALSE;
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    28
 	}
5a2ed0a547ed 2006-11-06 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    29