patches/nautilus-03-ftp-rename.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 12054 99f41b128c8e
child 22007 34c4666a5f42
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
     1
diff -urN naut.orig/libnautilus-private/nautilus-bookmark.c naut.new/libnautilus-private/nautilus-bookmark.c
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
     2
--- naut.orig/libnautilus-private/nautilus-bookmark.c	2008-04-07 13:33:19.366080000 +0100
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
     3
+++ naut.new/libnautilus-private/nautilus-bookmark.c	2008-04-07 13:55:49.482282000 +0100
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     4
@@ -25,6 +25,7 @@
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     5
 #include <config.h>
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     6
 #include "nautilus-bookmark.h"
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     7
 
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
     8
+#include "nautilus-file-private.h"
11383
4e0bd1ce6770 2007-01-03 Brian Cameron <[email protected]>
yippi
parents: 9060
diff changeset
     9
 #include "nautilus-file.h"
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    10
 #include <eel/eel-gdk-pixbuf-extensions.h>
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    11
 #include <eel/eel-gtk-extensions.h>
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    12
@@ -607,9 +608,17 @@
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    13
 {
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    14
 	char *path_name;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    15
 	gboolean exists;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    16
+	NautilusFile *file;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    17
 
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    18
 	/* Convert to a path, returning FALSE if not local. */
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    19
 	if (!g_file_is_native (bookmark->details->location)) {
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    20
+		/* It's a remote file, check for its existance */
11383
4e0bd1ce6770 2007-01-03 Brian Cameron <[email protected]>
yippi
parents: 9060
diff changeset
    21
+		file = nautilus_file_get_existing (bookmark->details->location);
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    22
+		if (file == NULL) {
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    23
+			/* Remote files does not exist, so return TRUE */
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    24
+			return TRUE;
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    25
+			}
9060
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
 	}
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    29
 	path_name = g_file_get_path (bookmark->details->location);