patches/nautilus-03-ftp-rename.diff
author padraig
Thu, 21 Jul 2011 09:15:41 +0000
changeset 22007 34c4666a5f42
parent 12054 99f41b128c8e
child 22420 06a88950b579
permissions -rw-r--r--
2011-07-21 Padraig O'Briain <[email protected]> * base-specs/nautilus.spec, patches/nautilus-01-trash-only-home.diff, patches/nautilus-03-ftp-rename.diff, patches/nautilus-05-context-menu.diff, patches/nautilus-06-frame-buffer.diff, patches/nautilus-07-lockdown.diff: Update patches to apply to 3.1.3.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22007
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     1
--- nautilus-3.1.3/libnautilus-private/nautilus-bookmark.c.orig	2011-04-04 19:01:22.000000000 +0100
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     2
+++ nautilus-3.1.3/libnautilus-private/nautilus-bookmark.c	2011-07-19 15:02:20.898939378 +0100
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     3
@@ -28,6 +28,9 @@
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     4
 
9060
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"
22007
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     8
+#include "nautilus-file.h"
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
     9
+
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    10
 #include <eel/eel-gtk-extensions.h>
22007
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
    11
 #include <eel/eel-gtk-macros.h>
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
    12
 #include <eel/eel-string.h>
34c4666a5f42 2011-07-21 Padraig O'Briain <[email protected]>
padraig
parents: 12054
diff changeset
    13
@@ -649,9 +652,17 @@
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    14
 {
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    15
 	char *path_name;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    16
 	gboolean exists;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    17
+	NautilusFile *file;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    18
 
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    19
 	/* Convert to a path, returning FALSE if not local. */
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    20
 	if (!g_file_is_native (bookmark->details->location)) {
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    21
+		/* It's a remote file, check for its existance */
11383
4e0bd1ce6770 2007-01-03 Brian Cameron <[email protected]>
yippi
parents: 9060
diff changeset
    22
+		file = nautilus_file_get_existing (bookmark->details->location);
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    23
+		if (file == NULL) {
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    24
+			/* Remote files does not exist, so return TRUE */
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    25
+			return TRUE;
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    26
+			}
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    27
+		nautilus_file_unref (file);
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    28
 		return FALSE;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset
    29
 	}
12054
99f41b128c8e 2008-04-07 Stephen Browne <[email protected]>
stephen
parents: 11383
diff changeset
    30
 	path_name = g_file_get_path (bookmark->details->location);