[arch-commits] Commit in lxterminal/repos (8 files)
Balló György
bgyorgy at nymeria.archlinux.org
Mon May 12 03:35:45 UTC 2014
Date: Monday, May 12, 2014 @ 05:35:45
Author: bgyorgy
Revision: 111033
archrelease: copy trunk to community-i686, community-x86_64
Added:
lxterminal/repos/community-i686/PKGBUILD
(from rev 111032, lxterminal/trunk/PKGBUILD)
lxterminal/repos/community-i686/fix-keybinds.patch
(from rev 111032, lxterminal/trunk/fix-keybinds.patch)
lxterminal/repos/community-x86_64/PKGBUILD
(from rev 111032, lxterminal/trunk/PKGBUILD)
lxterminal/repos/community-x86_64/fix-keybinds.patch
(from rev 111032, lxterminal/trunk/fix-keybinds.patch)
Deleted:
lxterminal/repos/community-i686/PKGBUILD
lxterminal/repos/community-i686/shift-keybinds.patch
lxterminal/repos/community-x86_64/PKGBUILD
lxterminal/repos/community-x86_64/shift-keybinds.patch
---------------------------------------+
/PKGBUILD | 78 +++++++++++++
community-i686/PKGBUILD | 34 -----
community-i686/fix-keybinds.patch | 183 ++++++++++++++++++++++++++++++++
community-i686/shift-keybinds.patch | 39 ------
community-x86_64/PKGBUILD | 34 -----
community-x86_64/fix-keybinds.patch | 183 ++++++++++++++++++++++++++++++++
community-x86_64/shift-keybinds.patch | 39 ------
7 files changed, 444 insertions(+), 146 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-05-12 03:35:36 UTC (rev 111032)
+++ community-i686/PKGBUILD 2014-05-12 03:35:45 UTC (rev 111033)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxterminal
-pkgver=0.1.11
-pkgrel=2
-pkgdesc="VTE-based terminal emulator (part of LXDE)"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://lxde.org/"
-groups=('lxde')
-depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2')
-makedepends=('pkgconfig' 'intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
- shift-keybinds.patch)
-md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
- '7eff715e02181b006b1912cd041b7f1a')
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
-
- patch -Np1 -i "$srcdir"/shift-keybinds.patch
-
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
Copied: lxterminal/repos/community-i686/PKGBUILD (from rev 111032, lxterminal/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-05-12 03:35:45 UTC (rev 111033)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxterminal
+pkgver=0.1.11
+pkgrel=3
+pkgdesc="VTE-based terminal emulator (part of LXDE)"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('vte')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
+ fix-keybinds.patch)
+md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
+ '1919977c8c745e65129dbe468b8dcbeb')
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ # Filter out key events of terminal keybinds
+ patch -Np1 -i ../fix-keybinds.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
Copied: lxterminal/repos/community-i686/fix-keybinds.patch (from rev 111032, lxterminal/trunk/fix-keybinds.patch)
===================================================================
--- community-i686/fix-keybinds.patch (rev 0)
+++ community-i686/fix-keybinds.patch 2014-05-12 03:35:45 UTC (rev 111033)
@@ -0,0 +1,183 @@
+diff -Naur lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
+--- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
++++ lxterminal-0.1.11/src/lxterminal.c 2014-05-12 05:13:32.264123691 +0200
+@@ -69,29 +70,29 @@
+ /* Menu and accelerator event handlers. */
+ static void terminal_initialize_switch_tab_accelerator(Term * term);
+ static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
+-static void terminal_switch_tab_accelerator(Term * term);
++static gboolean terminal_switch_tab_accelerator(Term * term);
+ static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
+ static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_execute(LXTerminal * terminal, gint direction);
+ static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
+
+ /* Window creation, destruction, and control. */
+@@ -327,11 +328,14 @@
+
+ /* Handler for accelerator <ALT> n, where n is a digit.
+ * Switch to the tab selected by the digit, if it exists. */
+-static void terminal_switch_tab_accelerator(Term * term)
++static gboolean terminal_switch_tab_accelerator(Term * term)
+ {
+ LXTerminal * terminal = term->parent;
+- if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook)))
++ if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index);
++ return TRUE;
++ }
++ return FALSE;
+ }
+
+ /* Handler for "activate" signal on File/New Window menu item.
+@@ -344,9 +348,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_window_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/New Tab menu item.
+@@ -405,9 +410,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/Close Tab menu item.
+@@ -419,9 +425,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_close_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Copy menu item.
+@@ -433,9 +440,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_copy_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Paste menu item.
+@@ -447,9 +455,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_paste_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "response" signal on Name Tab dialog. */
+@@ -521,9 +530,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_name_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Previous Tab menu item.
+@@ -538,10 +548,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Next Tab menu item.
+@@ -556,10 +567,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Helper for move tab left and right. */
+@@ -594,9 +606,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, -1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Move Tab Right menu item.
+@@ -607,9 +620,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, 1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Help/About menu item. */
Deleted: community-i686/shift-keybinds.patch
===================================================================
--- community-i686/shift-keybinds.patch 2014-05-12 03:35:36 UTC (rev 111032)
+++ community-i686/shift-keybinds.patch 2014-05-12 03:35:45 UTC (rev 111033)
@@ -1,39 +0,0 @@
-diff -ru lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
---- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
-+++ lxterminal-0.1.11/src/lxterminal.c 2012-05-18 17:58:40.483588501 +0200
-@@ -77,9 +77,9 @@
- static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
- static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-@@ -433,9 +433,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_copy_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "activate" signal on Edit/Paste menu item.
-@@ -447,9 +448,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_paste_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "response" signal on Name Tab dialog. */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-05-12 03:35:36 UTC (rev 111032)
+++ community-x86_64/PKGBUILD 2014-05-12 03:35:45 UTC (rev 111033)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
-
-pkgname=lxterminal
-pkgver=0.1.11
-pkgrel=2
-pkgdesc="VTE-based terminal emulator (part of LXDE)"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://lxde.org/"
-groups=('lxde')
-depends=('fontconfig' 'libx11' 'glib2' 'vte' 'gtk2')
-makedepends=('pkgconfig' 'intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
- shift-keybinds.patch)
-md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
- '7eff715e02181b006b1912cd041b7f1a')
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
-
- patch -Np1 -i "$srcdir"/shift-keybinds.patch
-
- ./configure --sysconfdir=/etc --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
Copied: lxterminal/repos/community-x86_64/PKGBUILD (from rev 111032, lxterminal/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-05-12 03:35:45 UTC (rev 111033)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+
+pkgname=lxterminal
+pkgver=0.1.11
+pkgrel=3
+pkgdesc="VTE-based terminal emulator (part of LXDE)"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('vte')
+makedepends=('intltool')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
+ fix-keybinds.patch)
+md5sums=('fd9140b45c0f28d021253c4aeb8c4aea'
+ '1919977c8c745e65129dbe468b8dcbeb')
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ # Filter out key events of terminal keybinds
+ patch -Np1 -i ../fix-keybinds.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ ./configure --sysconfdir=/etc --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
Copied: lxterminal/repos/community-x86_64/fix-keybinds.patch (from rev 111032, lxterminal/trunk/fix-keybinds.patch)
===================================================================
--- community-x86_64/fix-keybinds.patch (rev 0)
+++ community-x86_64/fix-keybinds.patch 2014-05-12 03:35:45 UTC (rev 111033)
@@ -0,0 +1,183 @@
+diff -Naur lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
+--- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
++++ lxterminal-0.1.11/src/lxterminal.c 2014-05-12 05:13:32.264123691 +0200
+@@ -69,29 +70,29 @@
+ /* Menu and accelerator event handlers. */
+ static void terminal_initialize_switch_tab_accelerator(Term * term);
+ static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
+-static void terminal_switch_tab_accelerator(Term * term);
++static gboolean terminal_switch_tab_accelerator(Term * term);
+ static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_new_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
+ static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_previous_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_next_tab_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_execute(LXTerminal * terminal, gint direction);
+ static void terminal_move_tab_left_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_move_tab_right_activate_event(GtkAction * action, LXTerminal * terminal);
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+ static void terminal_about_activate_event(GtkAction * action, LXTerminal * terminal);
+
+ /* Window creation, destruction, and control. */
+@@ -327,11 +328,14 @@
+
+ /* Handler for accelerator <ALT> n, where n is a digit.
+ * Switch to the tab selected by the digit, if it exists. */
+-static void terminal_switch_tab_accelerator(Term * term)
++static gboolean terminal_switch_tab_accelerator(Term * term)
+ {
+ LXTerminal * terminal = term->parent;
+- if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook)))
++ if (term->index < gtk_notebook_get_n_pages(GTK_NOTEBOOK(terminal->notebook))) {
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(terminal->notebook), term->index);
++ return TRUE;
++ }
++ return FALSE;
+ }
+
+ /* Handler for "activate" signal on File/New Window menu item.
+@@ -344,9 +348,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> N. Open a new window. */
+-static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_window_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/New Tab menu item.
+@@ -405,9 +410,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> T. Open a new tab. */
+-static void terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_new_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_new_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on File/Close Tab menu item.
+@@ -419,9 +425,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL> W. Close the current tab. */
+-static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_close_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Copy menu item.
+@@ -433,9 +440,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
+-static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_copy_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Edit/Paste menu item.
+@@ -447,9 +455,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
+-static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_paste_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "response" signal on Name Tab dialog. */
+@@ -521,9 +530,10 @@
+ }
+
+ /* Handler for accelerator <CTRL><SHIFT> R. Name the tab. */
+-static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_name_tab_activate_event(NULL, terminal);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Previous Tab menu item.
+@@ -538,10 +548,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE UP>. Cycle through tabs in the reverse direction. */
+-static void terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_previous_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_PreviousTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Next Tab menu item.
+@@ -556,10 +567,11 @@
+ }
+
+ /* Handler for accelerator <CTRL><PAGE DOWN>. Cycle through tabs in the forward direction. */
+-static void terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_next_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ GtkAction *_action = gtk_action_group_get_action(terminal->action_group, "Tabs_NextTab");
+ gtk_action_activate(_action);
++ return TRUE;
+ }
+
+ /* Helper for move tab left and right. */
+@@ -594,9 +606,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE UP>. Move the tab one position in the reverse direction. */
+-static void terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_left_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, -1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Tabs/Move Tab Right menu item.
+@@ -607,9 +620,10 @@
+ }
+
+ /* Handler for accelerator <SHIFT><CTRL><PAGE DOWN>. Move the tab one position in the forward direction. */
+-static void terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
++static gboolean terminal_move_tab_right_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
+ {
+ terminal_move_tab_execute(terminal, 1);
++ return TRUE;
+ }
+
+ /* Handler for "activate" signal on Help/About menu item. */
Deleted: community-x86_64/shift-keybinds.patch
===================================================================
--- community-x86_64/shift-keybinds.patch 2014-05-12 03:35:36 UTC (rev 111032)
+++ community-x86_64/shift-keybinds.patch 2014-05-12 03:35:45 UTC (rev 111033)
@@ -1,39 +0,0 @@
-diff -ru lxterminal-0.1.11.orig/src/lxterminal.c lxterminal-0.1.11/src/lxterminal.c
---- lxterminal-0.1.11.orig/src/lxterminal.c 2011-07-27 23:07:54.000000000 +0200
-+++ lxterminal-0.1.11/src/lxterminal.c 2012-05-18 17:58:40.483588501 +0200
-@@ -77,9 +77,9 @@
- static void terminal_close_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_close_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_copy_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_paste_activate_event(GtkAction * action, LXTerminal * terminal);
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
- static void terminal_name_tab_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal);
- static void terminal_name_tab_activate_event(GtkAction * action, LXTerminal * terminal);
- static void terminal_name_tab_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
-@@ -433,9 +433,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> C. Copy to the clipboard. */
--static void terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_copy_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_copy_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "activate" signal on Edit/Paste menu item.
-@@ -447,9 +448,10 @@
- }
-
- /* Handler for accelerator <CTRL><SHIFT> V. Paste from the clipboard. */
--static void terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
-+static gboolean terminal_paste_accelerator(LXTerminal * terminal, guint action, GtkWidget * item)
- {
- terminal_paste_activate_event(NULL, terminal);
-+ return TRUE;
- }
-
- /* Handler for "response" signal on Name Tab dialog. */
More information about the arch-commits
mailing list