Update to 3.18.1
This commit is contained in:
Kalev Lember
parent
07a4bda858
commit
6cadeb0754
1
.gitignore
vendored
1
.gitignore
vendored
@ -54,3 +54,4 @@ gnome-terminal-2.31.3.tar.bz2
|
||||
/gnome-terminal-3.16.2.tar.xz
|
||||
/gnome-terminal-3.17.91.tar.xz
|
||||
/gnome-terminal-3.18.0.tar.xz
|
||||
/gnome-terminal-3.18.1.tar.xz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From ece6bbee10191c60674669c810915ae741ee6d7c Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sat, 19 Sep 2015 16:56:15 +0200
|
||||
Subject: [PATCH] notebook: Don't change show-tabs when going to empty notebook
|
||||
|
||||
The window will close anyway, so the change is unnecessary. This fixes
|
||||
a crash in terminal-window's show-tabs change handler.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=755240
|
||||
(cherry picked from commit 7b7c38d01b198c9e2b32e2e6161472178f7492fa)
|
||||
---
|
||||
src/terminal-notebook.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
|
||||
index d6c9dd101c94..34236f9e7a43 100644
|
||||
--- a/src/terminal-notebook.c
|
||||
+++ b/src/terminal-notebook.c
|
||||
@@ -58,14 +58,20 @@ update_tab_visibility (TerminalNotebook *notebook,
|
||||
{
|
||||
TerminalNotebookPrivate *priv = notebook->priv;
|
||||
GtkNotebook *gtk_notebook = GTK_NOTEBOOK (notebook);
|
||||
+ int new_n_pages;
|
||||
gboolean show_tabs;
|
||||
|
||||
+ new_n_pages = gtk_notebook_get_n_pages (gtk_notebook) + change;
|
||||
+ /* Don't do anything if we're going to have zero pages (and thus close the window) */
|
||||
+ if (new_n_pages == 0)
|
||||
+ return;
|
||||
+
|
||||
switch (priv->policy) {
|
||||
case GTK_POLICY_ALWAYS:
|
||||
show_tabs = TRUE;
|
||||
break;
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
- show_tabs = (gtk_notebook_get_n_pages (gtk_notebook) + change) > 1;
|
||||
+ show_tabs = new_n_pages > 1;
|
||||
break;
|
||||
case GTK_POLICY_NEVER:
|
||||
#if GTK_CHECK_VERSION (3, 16, 0)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 44c6df308a2e5c331b44797c8537da430bb92df7 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@gnome.org>
|
||||
Date: Sat, 19 Sep 2015 16:58:34 +0200
|
||||
Subject: [PATCH] window: Exit early from screen-removed handler for now empty
|
||||
notebook
|
||||
|
||||
When the notebook is now empty, it's not necessary to change anything else
|
||||
since the window will be closed right away. Since GtkNotebook doesn't send
|
||||
the switch-page signal when removing the last and only screen in the notebook,
|
||||
priv->active_tab will point to an already freed object, which causes a
|
||||
crash when the window tries to update itself for the new active tab.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=755240
|
||||
(cherry picked from commit c8704ba3fef98d4acd59ec061566ff540b77c528)
|
||||
---
|
||||
src/terminal-window.c | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index e065ac1de49d..91279663fb50 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -3468,10 +3468,24 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
|
||||
G_CALLBACK (screen_close_cb),
|
||||
window);
|
||||
|
||||
+ /* We already got a switch-page signal whose handler sets the active tab to the
|
||||
+ * new active tab, unless this screen was the only one in the notebook, so
|
||||
+ * priv->active_tab is valid here.
|
||||
+ */
|
||||
+
|
||||
+ pages = terminal_mdi_container_get_n_screens (container);
|
||||
+ if (pages == 0)
|
||||
+ {
|
||||
+ priv->active_screen = NULL;
|
||||
+
|
||||
+ /* That was the last tab in the window; close it. */
|
||||
+ gtk_widget_destroy (GTK_WIDGET (window));
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
terminal_window_update_tabs_menu_sensitivity (window);
|
||||
terminal_window_update_search_sensitivity (screen, window);
|
||||
|
||||
- pages = terminal_mdi_container_get_n_screens (container);
|
||||
if (pages == 1)
|
||||
{
|
||||
TerminalScreen *active_screen = terminal_mdi_container_get_active_screen (container);
|
||||
@@ -3479,10 +3493,6 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
|
||||
|
||||
terminal_window_update_size (window);
|
||||
}
|
||||
- else if (pages == 0)
|
||||
- {
|
||||
- gtk_widget_destroy (GTK_WIDGET (window));
|
||||
- }
|
||||
}
|
||||
|
||||
gboolean
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 448cb610ed7c9f243275050b4b3a530561f0f8ab Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@gnome.org>
|
||||
Date: Mon, 5 Oct 2015 20:13:05 +0200
|
||||
Subject: [PATCH] window: Pass tab switching keys to the terminal for tabless
|
||||
windows
|
||||
|
||||
This was removed as a side effect of
|
||||
a319aeb66f36e728af1b4929ddd69574df838702
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=730128
|
||||
---
|
||||
src/terminal-window.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/terminal-window.c b/src/terminal-window.c
|
||||
index 91279663fb50..618425c0e4d5 100644
|
||||
--- a/src/terminal-window.c
|
||||
+++ b/src/terminal-window.c
|
||||
@@ -1820,6 +1820,7 @@ static void
|
||||
terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
|
||||
{
|
||||
TerminalWindowPrivate *priv = window->priv;
|
||||
+ GAction *gaction;
|
||||
GtkActionGroup *action_group = priv->action_group;
|
||||
GtkAction *action;
|
||||
int num_pages, page_num;
|
||||
@@ -1856,6 +1857,9 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
|
||||
gtk_action_set_sensitive (action, not_last);
|
||||
#endif
|
||||
|
||||
+ gaction = g_action_map_lookup_action (G_ACTION_MAP (window), "switch-tab");
|
||||
+ g_simple_action_set_enabled (G_SIMPLE_ACTION (gaction), num_pages > 1);
|
||||
+
|
||||
action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
|
||||
gtk_action_set_sensitive (action, not_first);
|
||||
action = gtk_action_group_get_action (action_group, "TabsMoveRight");
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,30 +1,24 @@
|
||||
%define gettext_package gnome-terminal
|
||||
|
||||
%define glib2_version 2.40.0
|
||||
%define glib2_version 2.42.0
|
||||
%define gtk3_version 3.10.0
|
||||
%define vte_version 0.41.90
|
||||
%define vte_version 0.42.1
|
||||
%define desktop_file_utils_version 0.2.90
|
||||
|
||||
Summary: Terminal emulator for GNOME
|
||||
Name: gnome-terminal
|
||||
Version: 3.18.0
|
||||
Version: 3.18.1
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+ and GFDL
|
||||
Group: User Interface/Desktops
|
||||
URL: http://www.gnome.org/
|
||||
#VCS: git:git://git.gnome.org/gnome-terminal
|
||||
Source0: http://download.gnome.org/sources/gnome-terminal/3.16/gnome-terminal-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/gnome-terminal/3.18/gnome-terminal-%{version}.tar.xz
|
||||
Source1: org.gnome.Terminal.gschema.override
|
||||
|
||||
Patch0: 0001-build-Don-t-treat-warnings-as-errors.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=755825
|
||||
Patch1: gnome-terminal-symbolic-new-tab-icon.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=755240
|
||||
Patch2: 0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=755240
|
||||
Patch3: 0001-window-Exit-early-from-screen-removed-handler-for-no.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=730128
|
||||
Patch4: 0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch
|
||||
|
||||
Patch100: gnome-terminal-restore-dark-transparency.patch
|
||||
Patch101: gnome-terminal-command-notify.patch
|
||||
@ -70,9 +64,6 @@ option to the right-click context menu in Nautilus.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .warnings
|
||||
%patch1 -p1 -b .new-tab-icon
|
||||
%patch2 -p1 -b .dont-change-show-tabs
|
||||
%patch3 -p1 -b .exit-early-from-screen
|
||||
%patch4 -p1 -b .pass-tab-switching-keys
|
||||
%patch100 -p1 -b .dark-transparency
|
||||
%patch101 -p1 -b .command-notify
|
||||
|
||||
@ -120,6 +111,9 @@ fi
|
||||
%{_libdir}/nautilus/extensions-3.0/libterminal-nautilus.so
|
||||
|
||||
%changelog
|
||||
* Wed Oct 14 2015 Kalev Lember <klember@redhat.com> - 3.18.1-1
|
||||
- Update to 3.18.1
|
||||
|
||||
* Wed Oct 07 2015 Debarshi Ray <rishi@fedoraproject.org> - 3.18.0-1
|
||||
- Update to 3.18.0
|
||||
- Backport a few upstream fixes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user