[gentoo-commits] gentoo-x86 commit in gnome-base/nautilus/files: nautilus-2.22.3-preserve-metadata.patch nautilus-2.22.3-open-folder.patch nautilus-2.22.3-prevent-recursive-mvcp.patch

[Gilles Dartiguelongue (eva)]

eva         08/06/29 22:34:35

  Added:                nautilus-2.22.3-preserve-metadata.patch
                        nautilus-2.22.3-open-folder.patch
                        nautilus-2.22.3-prevent-recursive-mvcp.patch
  Log:
  add patches from bugs #229719, #229723, #216391
  (Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

Revision  Changes    Path
1.1                  gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.22.3-preserve-metadata.patch
===================================================================
diff -ru nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c
--- nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c	2008-03-28 08:13:32.000000000 -0400
+++ nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c	2008-04-05 16:24:39.674861333 -0400
@@ -3245,7 +3245,7 @@
  retry:
 	
 	error = NULL;
-	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS;
+	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA;
 	if (overwrite) {
 		flags |= G_FILE_COPY_OVERWRITE;
 	}



1.1                  gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.22.3-open-folder.patch
===================================================================
diff -up nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder nautilus-2.22.2/libnautilus-private/nautilus-autorun.c
--- nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder	2008-04-17 22:30:04.000000000 -0400
+++ nautilus-2.22.2/libnautilus-private/nautilus-autorun.c	2008-04-17 22:30:10.000000000 -0400
@@ -1200,15 +1200,6 @@ typedef struct {
 	gpointer user_data;
 } AutorunData;
 
-
-static void
-autorun_open_folder_for_mount (AutorunData *data)
-{
-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
-	    data->open_window_func != NULL)
-		data->open_window_func (data->mount, data->user_data);
-}
-
 static void
 autorun_guessed_content_type_callback (GObject *source_object,
 				       GAsyncResult *res,
@@ -1237,13 +1228,14 @@ autorun_guessed_content_type_callback (G
 			}
 			g_strfreev (guessed_content_type);
 		} else {
-			open_folder = TRUE;
+			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
+				open_folder = TRUE;
 		}
 	}
 
 	/* only open the folder once.. */
-	if (open_folder) {
-		autorun_open_folder_for_mount (data);
+	if (open_folder && data->open_window_func != NULL) {
+		data->open_window_func (data->mount, data->user_data);
 	}
 
 	g_object_unref (data->mount);



1.1                  gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.22.3-prevent-recursive-mvcp.patch
===================================================================
Index: libnautilus-private/nautilus-file-operations.c
===================================================================
--- libnautilus-private/nautilus-file-operations.c	(revision 14108)
+++ libnautilus-private/nautilus-file-operations.c	(working copy)
@@ -3224,6 +3224,24 @@
 	}
 }
 
+static gboolean
+g_file_struct_contains (GFile *child, GFile *root)
+{
+    GFile *f;
+    
+    f = g_file_dup (child);
+    while (f) {
+	if (g_file_equal (f, root)) {
+	    g_object_unref (f);
+	    return TRUE;
+	}
+	f = g_file_get_parent (f);
+    }
+    
+    if (f)  g_object_unref (f);
+    return FALSE;
+}
+
 /* Debuting files is non-NULL only for toplevel items */
 static void
 copy_move_file (CopyMoveJob *copy_job,
@@ -3264,6 +3282,41 @@
 		dest = get_target_file (src, dest_dir, same_fs);
 	}
 
+
+	/* Don't allow recursive move/copy into itself.  
+         * (We would get a file system error if we proceeded but it is nicer to 
+         * detect and report it at this level) */
+	if (g_file_struct_contains (dest_dir, src)) {
+		if (job->skip_all_error) {
+			g_error_free (error);
+			goto out;
+		}
+		
+		/*  the run_warning() frees all strings passed in automatically  */
+		primary = copy_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
+					    : g_strdup (_("You cannot copy a folder into itself."));
+		secondary = g_strdup (_("The destination folder is inside the source folder."));
+		
+		response = run_warning (job,
+					primary,
+					secondary,
+					NULL,
+					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+					NULL);
+
+		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
+			abort_job (job);
+		} else if (response == 1) { /* skip all */
+			job->skip_all_error = TRUE;
+		} else if (response == 2) { /* skip */
+			/* do nothing */
+		} else {
+			g_assert_not_reached ();
+		}
+
+		goto out;
+	}
+	
  retry:
 	
 	error = NULL;
@@ -3791,6 +3844,41 @@
 	
 	dest = get_target_file (src, dest_dir, same_fs);
 
+
+	/* Don't allow recursive move/copy into itself.  
+         * (We would get a file system error if we proceeded but it is nicer to 
+         * detect and report it at this level) */
+	if (g_file_struct_contains (dest_dir, src)) {
+		if (job->skip_all_error) {
+			g_error_free (error);
+			goto out;
+		}
+		
+		/*  the run_warning() frees all strings passed in automatically  */
+		primary = move_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
+					    : g_strdup (_("You cannot copy a folder into itself."));
+		secondary = g_strdup (_("The destination folder is inside the source folder."));
+		
+		response = run_warning (job,
+					primary,
+					secondary,
+					NULL,
+					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
+					NULL);
+		
+		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
+			abort_job (job);
+		} else if (response == 1) { /* skip all */
+			job->skip_all_error = TRUE;
+		} else if (response == 2) { /* skip */
+			/* do nothing */
+		} else {
+			g_assert_not_reached ();
+		}
+
+		goto out;
+	}
+
  retry:
 	
 	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_NO_FALLBACK_FOR_MOVE;



-- 
gentoo-commits@l.g.o mailing list