Restore the Delete keyboard shortcut for deleting files (bug #393663, thanks to Pacho for reporting). Do not handle keyboard shortcuts in NautilusWindow if a text entry is focused (prevents files from getting deleted when pressing Delete in search entry). Only autostart in GNOME and Unity (bug #394379, thanks to Marc Schiffbauer for reporting).

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

6 files changed, 243 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 4ef6eb793178..cea2d6c91e6b 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.386 2011/11/25 06:17:44 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.387 2011/12/15 02:26:13 tetromino Exp $
+
+*nautilus-3.2.1-r1 (15 Dec 2011)
+
+  15 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +nautilus-3.2.1-r1.ebuild,
+  +files/nautilus-3.2.1-autostart-only-show-in.patch,
+  +files/nautilus-3.2.1-delete.patch,
+  +files/nautilus-3.2.1-key-press-forwarding.patch:
+  Restore the Delete keyboard shortcut for deleting files (bug #393663, thanks
+  to Pacho for reporting). Do not handle keyboard shortcuts in NautilusWindow
+  if a text entry is focused (prevents files from getting deleted when pressing
+  Delete in search entry). Only autostart in GNOME and Unity (bug #394379,
+  thanks to Marc Schiffbauer for reporting).
 
   25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   -nautilus-3.0.2.ebuild,
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index eb58f80c61e9..5f4693a3555a 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nautilus-3.2.1-autostart-only-show-in.patch 849 RMD160 884aec1829bea9c240b092103f7ca3634f9836a2 SHA1 9299fa82f44a0370fa739e665647d642197f9c5c SHA256 1eca642ae39f0a0fac2554882a9d5ab58c122545943b81a7755e11955e2f3026
+AUX nautilus-3.2.1-delete.patch 1869 RMD160 e730dfd7754dc619327347f3b5a578c9d6dd1317 SHA1 0f40dac0184320d86df3cccbe917084a4aea48e8 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0
+AUX nautilus-3.2.1-key-press-forwarding.patch 1716 RMD160 b158ab5e1ee158f7481b20c672da986f702305e5 SHA1 c703365c3468696b23eb8fa4161cf504fc7e29a7 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
 DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbff7 SHA1 246c6ae0539dc111d755727ad4cb12d8df7bd322 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
 EBUILD nautilus-2.32.2.1-r1.ebuild 2262 RMD160 b6e47de5db54d0d6f8a5c5ff5199b5ab0ce1221b SHA1 8e46537dd0e7582ed95c6149f6f71c0f893bf38a SHA256 2f5877b556945f51b4bfc025d099b17a4cd5b8c4e747b99d54751ed445705c84
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
+EBUILD nautilus-3.2.1-r1.ebuild 3255 RMD160 e446f9720741c3bdab5f2055f3d4fcb2a0d88d7b SHA1 4ba204b1c9d06256236a5bfd19b4b97c9a1a9834 SHA256 57e4251e183174afc9bbdf0ff38a2a4180054c2521e035d40743fd55e5a1c711
 EBUILD nautilus-3.2.1.ebuild 2836 RMD160 fe5a3f572d4e28ce3587d2072e759e37d16d1bec SHA1 134ec9d9a58539f767891bb4a8352248ef9e5062 SHA256 8cfb351e57ad832238970150e6f42e9989095a43006b4533e3db07884f231e80
-MISC ChangeLog 57608 RMD160 ddf356e7835fe057d2adb3e225d020befcc7e1a1 SHA1 59ed005bdee7cbd79fd20f48fa4b886d2b8f549a SHA256 e92b98d9d784c61f79bdd0332132c344cceff890434cc1548d532ef17817bd29
+MISC ChangeLog 58232 RMD160 09f64734ca1ac1d1ae59f344a84e3acc3acbfa2d SHA1 4b81cf893d3fa2d62cf2d1f82713d6b72225c7cf SHA256 8435c6e909ef446587ec40a1331ebb1af572f6848c6632bcb727d10fde899ad1
 MISC metadata.xml 667 RMD160 4905458681c088bef4b030ee1a963a71b9cb53bd SHA1 fa3a39a43c3e54058f3996d30fa93cd8d03897aa SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7PMw0ACgkQdjK8w9WeBnAo8QD/cX4Ucx2KYEABUy1+dXuu0ZXk
-3Lzo9yL4FxJFJRmABrwA/36goy8jFk/hSAHrFmDLTznbBxg2YDEmKXlQuUhem0DB
-=Noa4
+iF4EAREIAAYFAk7pWssACgkQdjK8w9WeBnAJ3QEAnbkkml0pB8Yx9CUgNxgZi9G2
+D/hV4q+vHadxW37gkUIA/0pJxtv02p5NPJr36Eig1xonrSoDRK4EZO9p3GqKr0O8
+=eJtm
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch b/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch
new file mode 100644
index 000000000000..efc56ef1e7e9
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-autostart-only-show-in.patch
@@ -0,0 +1,26 @@
+From 0d64367e9abb67329133b2e05cb63309479b7f24 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 14 Dec 2011 16:34:46 -0500
+Subject: [PATCH] Autostart only in GNOME and Unity
+
+We do not want to autostart and manage the desktop in DEs that use other
+applications for managing the desktop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=666218
+---
+ data/nautilus-autostart.desktop.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/data/nautilus-autostart.desktop.in b/data/nautilus-autostart.desktop.in
+index f105b7b..7252f87 100644
+--- a/data/nautilus-autostart.desktop.in
++++ b/data/nautilus-autostart.desktop.in
+@@ -2,4 +2,5 @@
+ Type=Application
+ Name=Files
+ Exec=nautilus -n
++OnlyShowIn=GNOME;Unity;
+ AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
+-- 
+1.7.8
+
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
new file mode 100644
index 000000000000..7720a6b74ccf
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 000000000000..4ad417edd6c2
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
@@ -0,0 +1,40 @@
+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
+
diff --git a/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..ad28c6600427
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1-r1.ebuild,v 1.1 2011/12/15 02:26:13 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Nautilus"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.1.6:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3.0.0:3
+
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/libnotify-0.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	tracker? ( >=app-misc/tracker-0.12 )
+	xmp? ( >=media-libs/exempi-2.1.0 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	x11-proto/xproto
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+PDEPEND="gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-0.1.2"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-update-mimedb
+		$(use_enable exif libexif)
+		$(use_enable introspection)
+		$(use_enable packagekit)
+		$(use_enable sendto nst-extension)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# bug #393663
+	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
+	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
+
+	# bug #394379, https://bugzilla.gnome.org/show_bug.cgi?id=666218
+	epatch "${FILESDIR}/${PN}-3.2.1-autostart-only-show-in.patch"
+
+	# Remove crazy CFLAGS
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
+		|| die "sed 1 failed"
+}
+
+src_test() {
+	addpredict "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		elog "nautilus uses gnome-extra/sushi to preview media files."
+		elog "To activate the previewer, select a file and press space; to"
+		elog "close the previewer, press space again."
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}