summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2004-03-23 19:15:24 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2004-03-23 19:15:24 +0000
commitcfd5f2d4fe53915b4b12412c975b8e416f72e317 (patch)
treeba323ed8d99ba559b776bfc6d2b2d541c5b6994e /x11-terms/gnome-terminal
parentcleanup (Manifest recommit) (diff)
downloadgentoo-2-cfd5f2d4fe53915b4b12412c975b8e416f72e317.tar.gz
gentoo-2-cfd5f2d4fe53915b4b12412c975b8e416f72e317.tar.bz2
gentoo-2-cfd5f2d4fe53915b4b12412c975b8e416f72e317.zip
Patch to make the keyboard shortcuts work when the menubar is hidden. Closes bug #45460.
Diffstat (limited to 'x11-terms/gnome-terminal')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog8
-rw-r--r--x11-terms/gnome-terminal/files/gnome-terminal-2.4.2-shortcuts_fix.patch31
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.4.0.1.ebuild4
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.4.2.ebuild8
4 files changed, 45 insertions, 6 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/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"