pool/lxterminal
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 44164 from X11:lxde

Browse Source 
Copy from X11:lxde/lxterminal based on submit request 44164 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/44164
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxterminal?expand=0&rev=10
This commit is contained in:
OBS User autobuild 2010-08-02 08:34:01 +00:00 committed by Git OBS Bridge
commit 997f6f7857
4 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch Normal file
View File

@ -0,0 +1,25 @@
From 86fbd89e295dfd7dfdc3a4ac838e3aca524dd02c Mon Sep 17 00:00:00 2001
From: Marty Jack <martyj@linux.local>
Date: Wed, 28 Jul 2010 17:30:47 -0400
Subject: [PATCH] Fix Alt-key assignment after tab deleted (Bug3036189; Patch3036253, Ideal Shang)
---
src/lxterminal.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/lxterminal.c b/src/lxterminal.c
index a263150..9f89bb4 100644
--- a/src/lxterminal.c
+++ b/src/lxterminal.c
@@ -737,6 +737,9 @@ static void terminal_child_exited_event(VteTerminal * vte, Term * term)
{
Term * t = g_ptr_array_index(terminal->terms, i);
t->index -= 1;
+ if ((GTK_IS_ACCEL_GROUP(t->parent->accel_group)) && (t->closure != NULL))
+ gtk_accel_group_disconnect(t->parent->accel_group, t->closure);
+ terminal_set_disable_alt(t, t->parent->setting->disable_alt);
}
/* Delete the tab and free the Term structure. */
--
1.6.3

20
lxterminal-0.1.8-hide_menu_bar-sf3032519.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/src/lxterminal.c b/src/lxterminal.c
index dc63796..a263150 100644
--- a/src/lxterminal.c
+++ b/src/lxterminal.c
@@ -1244,12 +1244,12 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
/* Initialize accelerators. */
terminal_accelerator_initialize(terminal);
- /* Update terminal settings. */
- terminal_settings_apply(terminal);
-
/* Show the widget, so it is realized and has a window. */
gtk_widget_show_all(terminal->window);
+ /* Update terminal settings. */
+ terminal_settings_apply(terminal);
+
/* Initialize the geometry hints. */
gdk_window_get_geometry_hints(GTK_WIDGET(term->vte)->window, &terminal->geometry, &terminal->geometry_mask);

12
lxterminal.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
- added lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch to
fix bug sf#3036189
-------------------------------------------------------------------
Wed Jul 21 10:07:47 UTC 2010 - andrea@opensuse.org
- added lxterminal-0.1.8-hide_menu_bar-sf3032519.patch to fix
bug sf#3032519
-------------------------------------------------------------------
Tue Jul 20 07:42:08 UTC 2010 - andrea@opensuse.org

11
lxterminal.spec
View File

@ -20,7 +20,7 @@
Name: lxterminal
Version: 0.1.8
Release: 1
Release: 2
Summary: Lightweight LXDE Terminal
Group: System/GUI/LXDE
License: GPL
@ -32,6 +32,13 @@ Patch0: %name-0.1.8-disable-f10.patch
# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix-alt_n-sf3006779.patch andrea@opensuse.org
# upstream patch to fix sf#3006779 (enable/disable Alt+n)
Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2
# PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org
# upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit
# and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem
Patch2: %name-0.1.8-hide_menu_bar-sf3032519.patch
# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org
# upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted
Patch3: %name-0.1.8-fix_alt-key_after_tab_delete.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel
@ -48,6 +55,8 @@ of the LXDE project
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"