patches/nautilus-03-ftp-rename.diff
author stephen
Tue, 23 Jan 2007 12:42:24 +0000
changeset 9060 c457ded950ba
child 11383 4e0bd1ce6770
permissions -rw-r--r--
2007-01-23 Stephen Browne <[email protected]> * nautilus.spec: removed two patches * patches/nautilus-07-lockdown.diff: reworked for new tarball * patches/nautilus-09-interface-changes.diff: reworked for new tarball * patches/nautilus-[0-9]*.diff: renumbered
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9060
c457ded950ba 2007-01-23 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
c457ded950ba 2007-01-23 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
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     3
@@ -25,6 +25,7 @@
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     4
 #include <config.h>
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     5
 #include "nautilus-bookmark.h"
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     6
 
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     7
+#include "nautilus-file-private.h"
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     8
 #include "nautilus-icon-factory.h"
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     9
 #include <eel/eel-gdk-pixbuf-extensions.h>
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    10
 #include <eel/eel-gtk-extensions.h>
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    11
@@ -534,10 +535,18 @@ nautilus_bookmark_uri_known_not_to_exist
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    12
 {
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    13
 	char *path_name;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    14
 	gboolean exists;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    15
+	NautilusFile *file;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    16
 
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    17
 	/* Convert to a path, returning FALSE if not local. */
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    18
 	path_name = gnome_vfs_get_local_path_from_uri (bookmark->details->uri);
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    19
 	if (path_name == NULL) {
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    20
+		/* It's a remote file, check for its existence. */
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    21
+		file = nautilus_file_get_existing (bookmark->details->uri);
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    22
+		if (file == NULL) {
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    23
+			/* Remote file does not exist, so return TRUE */
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    24
+			return TRUE;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    25
+		}
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    26
+		nautilus_file_unref (file);
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    27
 		return FALSE;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    28
 	}
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    29