5 files changed, 51 insertions, 11 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 2ce5faf02c2b..dd8ffb7ad107 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/gnome-terminal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.54 2004/03/23 15:06:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.55 2004/03/23 19:15:24 leonardop Exp $
+
+  23 Mar 2004; L. Boshell <leonardop@gentoo.org>
+  gnome-terminal-2.4.2.ebuild,
+  files/gnome-terminal-2.4.2-shortcuts_fix.patch:
+  Patch from gnome's CVS to avoid non-functioning keyboard shortcuts when
+  the menubar is hidden. Closes bug #45460.
 
 *gnome-terminal-2.6.0 (22 Mar 2004)
 
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index f2f8617c4610..7fa2012439d7 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,10 +1,11 @@
-MD5 736c438924556e2238ac9e7dbd0c2e9e gnome-terminal-2.4.0.1.ebuild 1077
+MD5 d498780c69146d368e08ca43a2f662f4 ChangeLog 7051
 MD5 f172347fc596ff00ff0c141a3bdaf3c4 gnome-terminal-2.6.0.ebuild 1170
-MD5 58f135e1e209d6528bc0af68dc078ad3 ChangeLog 6798
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d4f0999daf7e195c2a30841e470172d9 gnome-terminal-2.4.2.ebuild 1079
-MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74
+MD5 30ec5d207d6e8ea1d936d9c9068dd730 gnome-terminal-2.4.0.1.ebuild 1078
+MD5 d9e5e599773110af5892dbf91fc0ec0b gnome-terminal-2.4.2.ebuild 1189
 MD5 b3a6b960b39b9070746d366be76739f9 files/digest-gnome-terminal-2.6.0 74
+MD5 3c82681825a313b5d5342acb6f82cd8f files/digest-gnome-terminal-2.4.0.1 76
+MD5 0992c11acfb7df9271bd526a65b6f1bb files/digest-gnome-terminal-2.4.2 74
+MD5 307641ad0c36aecafbe97053c944098f files/gnome-terminal-2.4.2-shortcuts_fix.patch 1037
 MD5 1c5aaf13eb2a8bd0b2b03c529d5c8740 files/gnome-terminal-2-default_shell.patch 490
 MD5 206e36d5520f43272f029d6411af6332 files/gnome-terminal-2-dnd_url_add_space.patch 1000
-MD5 3c82681825a313b5d5342acb6f82cd8f files/digest-gnome-terminal-2.4.0.1 76
diff --git a/x11-terms/gnome-terminal/files/gnome-terminal-2.4.2-shortcuts_fix.patch b/x11-terms/gnome-terminal/files/gnome-terminal-2.4.2-shortcuts_fix.patch
new file mode 100644
index 000000000000..df6c727df992
--- /dev/null
+++ b/x11-terms/gnome-terminal/files/gnome-terminal-2.4.2-shortcuts_fix.patch
@@ -0,0 +1,31 @@
+diff -NurB gnome-terminal-2.4.2-orig/src/terminal-window.c gnome-terminal-2.4.2/src/terminal-window.c
+--- gnome-terminal-2.4.2-orig/src/terminal-window.c	2004-03-23 12:40:29.000000000 -0500
++++ gnome-terminal-2.4.2/src/terminal-window.c	2004-03-23 12:52:32.000000000 -0500
+@@ -239,6 +239,15 @@
+   return object_type;
+ }
+ 
++static gboolean
++can_activate_accel_callback (GtkWidget *widget,
++                guint      signal_id,
++                gpointer   user_data)
++{
++   /* Always allow accels to be activated. */
++   return TRUE;
++}
++
+ static GtkWidget*
+ append_menuitem (GtkWidget  *menu,
+                  const char *text,
+@@ -726,6 +735,11 @@
+   window->priv->use_mnemonics = TRUE;
+   window->priv->using_mnemonics = FALSE;
+   
++  g_signal_connect (window->priv->menubar,
++           "can_activate_accel",
++           G_CALLBACK (can_activate_accel_callback),
++           window);
++
+   accel_group = terminal_accels_get_group_for_widget (GTK_WIDGET (window));
+   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
+   
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild
index 28f59df39c17..c5a309e4a7b4 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild,v 1.7 2003/11/15 03:17:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild,v 1.8 2004/03/23 19:15:24 leonardop Exp $
 
 inherit gnome2 eutils
 
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
index 8505cbe2e3d8..3228ede2c087 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild,v 1.6 2004/03/17 00:56:40 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild,v 1.7 2004/03/23 19:15:24 leonardop Exp $
 
 inherit gnome2 eutils
 
@@ -25,16 +25,18 @@ DEPEND="${RDEPEND}
 # gnome-core overwrite /usr/bin/gnome-terminal
 
 src_unpack() {
-
 	unpack ${A}
-
 	cd ${S}
+
 	# Use login shell by default (#12900) 
 	epatch ${FILESDIR}/${PN}-2-default_shell.patch
+
 	# terminal enhancement, inserts a space after a DND URL
 	# patch by Zach Bagnall <yem@y3m.net> in #13801
 	epatch ${FILESDIR}/${PN}-2-dnd_url_add_space.patch
 
+	# Enable keyboard shortcuts when the menubar is not visible.
+	epatch ${FILESDIR}/${P}-shortcuts_fix.patch
 }
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"