Clean up old revision.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 0 insertions, 84 deletions

diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
deleted file mode 100644
index 7720a6b74ccf..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0c86d481ac075d733ddffae7a67aa23b0b4d54c5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 8 Dec 2011 18:39:28 -0500
-Subject: [PATCH] Delete key should delete files
-
-Make the Delete key delete files like in nautilus-2.x and every other
-file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
-will also continue to work.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=647048
-https://bugs.gentoo.org/show_bug.cgi?id=393663
----
- src/nautilus-view.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/src/nautilus-view.c b/src/nautilus-view.c
-index dca1413..f3928db 100644
---- a/src/nautilus-view.c
-+++ b/src/nautilus-view.c
-@@ -7014,7 +7014,7 @@ static const GtkActionEntry directory_view_entries[] = {
-   /* tooltip */                  NULL,
- 				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { "Trash", NULL,
--  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>Delete",
-+  /* label, accelerator */       N_("Mo_ve to Trash"), "Delete",
-   /* tooltip */                  N_("Move each selected item to the Trash"),
- 				 G_CALLBACK (action_trash_callback) },
-   /* name, stock id */         { "Delete", NULL,
-@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
- 	binding_set = gtk_binding_set_by_class (klass);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
- 				      "trash", 0);
-+	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
-+				      "trash", 0);
- 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
- 				      "delete", 0);
- }
--- 
-1.7.8
-
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
deleted file mode 100644
index 4ad417edd6c2..000000000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d4e2a297589e35a9545d996a4f0a61d22152e4c7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 14 Dec 2011 20:43:08 -0500
-Subject: [PATCH] Do not handle keyboard shortcuts in NautilusWindow if an
- editable widget is focused
-
-If an editable widget (e.g. GtkEntry in the location bar or search bar) is
-focused, NautilusWindow should forward all key press events to it since the
-window's accelerator bindings may conflict with the widget's.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664573
----
- src/nautilus-window.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/nautilus-window.c b/src/nautilus-window.c
-index c3a3c2c..e8646d8 100644
---- a/src/nautilus-window.c
-+++ b/src/nautilus-window.c
-@@ -1117,11 +1117,12 @@ nautilus_window_key_press_event (GtkWidget *widget,
- 	active_slot = nautilus_window_get_active_slot (window);
- 	view = active_slot->content_view;
- 
--	if (view != NULL && nautilus_view_get_is_renaming (view)) {
--		/* if we're renaming, just forward the event to the
--		 * focused widget and return. We don't want to process the window
--		 * accelerator bindings, as they might conflict with the 
--		 * editable widget bindings.
-+	if ((view != NULL && (nautilus_view_get_is_renaming (view))) || GTK_IS_EDITABLE (gtk_window_get_focus (window))) {
-+		/* If we're renaming, or editing a GtkEntry (e.g. location or
-+		 * search bar), just forward the event to the focused widget
-+		 * and return.
-+		 * We don't want to process the window accelerator bindings,
-+		 * as they might conflict with the editable widget bindings.
- 		 */
- 		if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) {
- 			return TRUE;
--- 
-1.7.8
-