From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SEazV-0000fI-Sv for garchives@archives.gentoo.org; Mon, 02 Apr 2012 06:43:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FF0DE0A94; Mon, 2 Apr 2012 06:43:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D4016E0A94 for ; Mon, 2 Apr 2012 06:43:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03CEA1B400F for ; Mon, 2 Apr 2012 06:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E2EF3E5403 for ; Mon, 2 Apr 2012 06:43:30 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1333346498.d94877b0775d4a8986ae3bddc2e61f748707813a.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/files/nautilus-3.2.1-delete.patch gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch gnome-base/nautilus/nautilus-3.4.0.ebuild gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ gnome-base/nautilus/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: d94877b0775d4a8986ae3bddc2e61f748707813a X-VCS-Branch: master Date: Mon, 2 Apr 2012 06:43:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cc18a7f2-762a-4c66-a2fc-38fd4abdb1a4 X-Archives-Hash: 6a8a7a5855f93fc760610bc7c490e9fd commit: d94877b0775d4a8986ae3bddc2e61f748707813a Author: Alexandre Rostovtsev gentoo org> AuthorDate: Mon Apr 2 06:01:38 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Apr 2 06:01:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dd94877b0 gnome-base/nautilus: add 3.4.0 --- .../nautilus/files/nautilus-3.2.1-delete.patch | 44 ++++++++++++++= ++++++ .../nautilus-3.2.1-key-press-forwarding.patch | 40 ++++++++++++++= ++++ ...{nautilus-9999.ebuild =3D> nautilus-3.4.0.ebuild} | 21 +++++++--- gnome-base/nautilus/nautilus-9999.ebuild | 21 +++++++--- 4 files changed, 114 insertions(+), 12 deletions(-) diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnom= e-base/nautilus/files/nautilus-3.2.1-delete.patch new file mode 100644 index 0000000..7720a6b --- /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 +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=3D647048 +https://bugs.gentoo.org/show_bug.cgi?id=3D393663 +--- + 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= [] =3D { + /* tooltip */ NULL, + G_CALLBACK (action_rename_select_all_callback) }, + /* name, stock id */ { "Trash", NULL, +- /* label, accelerator */ N_("Mo_ve to Trash"), "Delete= ", ++ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", + /* tooltip */ N_("Move each selected item to the Tra= sh"), + G_CALLBACK (action_trash_callback) }, + /* name, stock id */ { "Delete", NULL, +@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klas= s) + binding_set =3D 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_CONT= ROL_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_SHIF= T_MASK, + "delete", 0); + } +--=20 +1.7.8 + diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwardin= g.patch b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.p= atch new file mode 100644 index 0000000..4ad417e --- /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 +Date: Wed, 14 Dec 2011 20:43:08 -0500 +Subject: [PATCH] Do not handle keyboard shortcuts in NautilusWindow if a= n + 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=3D664573 +--- + 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 *widg= et, + active_slot =3D nautilus_window_get_active_slot (window); + view =3D active_slot->content_view; +=20 +- if (view !=3D 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=20 +- * editable widget bindings. ++ if ((view !=3D 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; +--=20 +1.7.8 + diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautil= us/nautilus-3.4.0.ebuild similarity index 83% copy from gnome-base/nautilus/nautilus-9999.ebuild copy to gnome-base/nautilus/nautilus-3.4.0.ebuild index e16b5c3..5cbc206 100644 --- a/gnome-base/nautilus/nautilus-9999.ebuild +++ b/gnome-base/nautilus/nautilus-3.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 virtualx +inherit eutils gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -25,9 +25,9 @@ IUSE=3D"doc exif gnome +introspection packagekit +previ= ewer sendto tracker xmp" =20 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2= .29.92 # and 2.30.0 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30.0:2 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.9:2 >=3Dx11-libs/pango-1.28.3 - >=3Dx11-libs/gtk+-3.1.6:3[introspection?] + >=3Dx11-libs/gtk+-3.3.17:3[introspection?] >=3Ddev-libs/libxml2-2.7.8:2 >=3Dgnome-base/gnome-desktop-3.0.0:3 =20 @@ -44,7 +44,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30.0:2 xmp? ( >=3Dmedia-libs/exempi-2.1.0 )" DEPEND=3D"${COMMON_DEPEND} >=3Ddev-lang/perl-5 - >=3Ddev-util/gdbus-codegen-2.30.0 + >=3Ddev-util/gdbus-codegen-2.31.0 >=3Ddev-util/pkgconfig-0.9 >=3Ddev-util/intltool-0.40.1 sys-devel/gettext @@ -79,6 +79,13 @@ pkg_setup() { src_prepare() { gnome2_src_prepare =20 + # 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=3D664573 + epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch" + # Remove crazy CFLAGS sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ || die "sed 1 failed" @@ -89,7 +96,9 @@ src_test() { unset SESSION_MANAGER unset ORBIT_SOCKETDIR unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "Test phase failed" + export GSETTINGS_BACKEND=3D"memory" + Xemake check + unset GSETTINGS_BACKEND } =20 pkg_postinst() { diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautil= us/nautilus-9999.ebuild index e16b5c3..5cbc206 100644 --- a/gnome-base/nautilus/nautilus-9999.ebuild +++ b/gnome-base/nautilus/nautilus-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 virtualx +inherit eutils gnome2 virtualx if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -25,9 +25,9 @@ IUSE=3D"doc exif gnome +introspection packagekit +previ= ewer sendto tracker xmp" =20 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2= .29.92 # and 2.30.0 -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30.0:2 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.9:2 >=3Dx11-libs/pango-1.28.3 - >=3Dx11-libs/gtk+-3.1.6:3[introspection?] + >=3Dx11-libs/gtk+-3.3.17:3[introspection?] >=3Ddev-libs/libxml2-2.7.8:2 >=3Dgnome-base/gnome-desktop-3.0.0:3 =20 @@ -44,7 +44,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.30.0:2 xmp? ( >=3Dmedia-libs/exempi-2.1.0 )" DEPEND=3D"${COMMON_DEPEND} >=3Ddev-lang/perl-5 - >=3Ddev-util/gdbus-codegen-2.30.0 + >=3Ddev-util/gdbus-codegen-2.31.0 >=3Ddev-util/pkgconfig-0.9 >=3Ddev-util/intltool-0.40.1 sys-devel/gettext @@ -79,6 +79,13 @@ pkg_setup() { src_prepare() { gnome2_src_prepare =20 + # 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=3D664573 + epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch" + # Remove crazy CFLAGS sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ || die "sed 1 failed" @@ -89,7 +96,9 @@ src_test() { unset SESSION_MANAGER unset ORBIT_SOCKETDIR unset DBUS_SESSION_BUS_ADDRESS - Xemake check || die "Test phase failed" + export GSETTINGS_BACKEND=3D"memory" + Xemake check + unset GSETTINGS_BACKEND } =20 pkg_postinst() {