diff --git a/.gitignore b/.gitignore index bf0670b..f71af04 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.36.1.tar.xz /gnome-terminal-3.36.1.1.tar.xz /gnome-terminal-3.36.2.tar.xz +/gnome-terminal-3.37.90.tar.xz diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index 8bfdb8c..4643320 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,4 +1,4 @@ -From eaf850b3aa0bb1a997966efbd7a194d770b8e640 Mon Sep 17 00:00:00 2001 +From c56653152c2cc7e3de700a2098643c646d420450 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 12 May 2014 14:57:18 +0200 Subject: [PATCH 01/16] Restore transparency @@ -25,10 +25,10 @@ Some changes by Peter Weber 6 files changed, 104 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index be6205d6a3be..0a1d8eaf5fed 100644 +index be00aa2d80de..7b04919202b7 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -344,6 +344,16 @@ +@@ -349,6 +349,16 @@ 'narrow' Whether ambiguous-width characters are narrow or wide when using UTF-8 encoding @@ -46,7 +46,7 @@ index be6205d6a3be..0a1d8eaf5fed 100644 diff --git a/src/preferences.ui b/src/preferences.ui -index a6cf07d2e8c1..6526c4ff4832 100644 +index d1aca7b2c35c..64f8295bf2b0 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -95,6 +95,11 @@ @@ -61,7 +61,7 @@ index a6cf07d2e8c1..6526c4ff4832 100644 -@@ -1399,6 +1404,48 @@ +@@ -1402,6 +1407,48 @@ 1 @@ -111,13 +111,13 @@ index a6cf07d2e8c1..6526c4ff4832 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c -index f2e8bd45cfe2..6038a9c60949 100644 +index 4098f90bf10e..35bd24791417 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c -@@ -1389,6 +1389,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) - w, - "active-id", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); +@@ -1431,6 +1431,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) + profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, + "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0); + + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, @@ -138,10 +138,10 @@ index f2e8bd45cfe2..6038a9c60949 100644 /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 05e9f8198549..c9e7c895d700 100644 +index cffc4ed86b9f..6bfd3e346895 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h -@@ -75,6 +75,9 @@ G_BEGIN_DECLS +@@ -76,6 +76,9 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" @@ -152,10 +152,10 @@ index 05e9f8198549..c9e7c895d700 100644 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY "menu-accelerator-enabled" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 1b70094c4cbc..643525af489d 100644 +index f20c5d0f8dba..4f2efea7cd22 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1064,7 +1064,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1072,7 +1072,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_COLORS_SET_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_BACKGROUND_COLOR_KEY) || prop_name == I_(TERMINAL_PROFILE_HIGHLIGHT_FOREGROUND_COLOR_KEY) || @@ -166,7 +166,7 @@ index 1b70094c4cbc..643525af489d 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1145,6 +1147,8 @@ update_color_scheme (TerminalScreen *screen) +@@ -1157,6 +1159,8 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; GtkStyleContext *context; @@ -175,7 +175,7 @@ index 1b70094c4cbc..643525af489d 100644 gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -1188,6 +1192,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -1200,6 +1204,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -194,7 +194,7 @@ index 1b70094c4cbc..643525af489d 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1195,6 +1211,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -1207,6 +1223,10 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_cursor_foreground (VTE_TERMINAL (screen), cursor_fgp); vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -231,10 +231,10 @@ index 7a8953c50388..a3d77bf6719d 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.24.1 +2.25.4 -From 91d49dfc366704298e08ca53dbf98d8fb8a63e69 Mon Sep 17 00:00:00 2001 +From 3c1c7e6aa0cbfc6b4683c63fb492d4e44ed93f75 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 28 May 2014 14:11:02 +0200 Subject: [PATCH 02/16] window: Make the drawing robust across all themes @@ -293,10 +293,10 @@ index a3d77bf6719d..36d155a9e420 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.24.1 +2.25.4 -From bb3745c7758c6b01462d11b97200fea4247a6daf Mon Sep 17 00:00:00 2001 +From cbc9f0541cb5068724771baffd8991a011712950 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 13 Nov 2015 15:16:42 +0100 Subject: [PATCH 03/16] screen, window: Extra padding around transparent @@ -309,10 +309,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 643525af489d..655b6f541b18 100644 +index 4f2efea7cd22..6ae454c8b1ac 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -155,6 +155,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -151,6 +151,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, static gboolean terminal_screen_popup_menu (GtkWidget *widget); static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event); @@ -321,7 +321,7 @@ index 643525af489d..655b6f541b18 100644 static void terminal_screen_child_exited (VteTerminal *terminal, int status); -@@ -624,6 +626,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -618,6 +620,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) widget_class->drag_data_received = terminal_screen_drag_data_received; widget_class->button_press_event = terminal_screen_button_press; widget_class->popup_menu = terminal_screen_popup_menu; @@ -329,7 +329,7 @@ index 643525af489d..655b6f541b18 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -1132,6 +1135,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1144,6 +1147,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -362,7 +362,7 @@ index 643525af489d..655b6f541b18 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -1147,7 +1176,6 @@ update_color_scheme (TerminalScreen *screen) +@@ -1159,7 +1188,6 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; GtkStyleContext *context; @@ -370,7 +370,7 @@ index 643525af489d..655b6f541b18 100644 gboolean transparent; gboolean use_theme_colors; -@@ -1212,9 +1240,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -1224,9 +1252,7 @@ update_color_scheme (TerminalScreen *screen) vte_terminal_set_color_highlight (VTE_TERMINAL (screen), highlight_bgp); vte_terminal_set_color_highlight_foreground (VTE_TERMINAL (screen), highlight_fgp); @@ -381,7 +381,7 @@ index 643525af489d..655b6f541b18 100644 } static void -@@ -1797,6 +1823,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1745,6 +1771,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -428,10 +428,10 @@ index 36d155a9e420..c0219d872725 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.24.1 +2.25.4 -From 59aab89647482a062cb58ee4288caa5913476ef8 Mon Sep 17 00:00:00 2001 +From 5e999eed5fb1327a0e1aebaf480dffbba104a38e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 18 May 2018 20:15:34 +0200 Subject: [PATCH 04/16] screen: Try harder to find a foreground process group @@ -457,10 +457,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 655b6f541b18..ae9267791461 100644 +index 6ae454c8b1ac..fe6cfbeb7200 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -2384,7 +2384,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2332,7 +2332,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, #else g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", fgpid); if (!g_file_get_contents (filename, &data_buf, &len, NULL)) @@ -498,10 +498,10 @@ index 655b6f541b18..ae9267791461 100644 #endif -- -2.24.1 +2.25.4 -From f86ab4c8f8124943824716f3bebda4555d662448 Mon Sep 17 00:00:00 2001 +From ef82bc454c0639810050ce9849fae253aeeed40e Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 3 May 2018 16:49:28 +0200 Subject: [PATCH 05/16] screen: Track the current foreground process @@ -549,10 +549,10 @@ index 0fafcc3a846c..b0f2fc9df7f6 100644 void _terminal_debug_init(void); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index ae9267791461..31ede77e62db 100644 +index fe6cfbeb7200..3e18c2477438 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -111,6 +111,11 @@ struct _TerminalScreenPrivate +@@ -107,6 +107,11 @@ struct _TerminalScreenPrivate gboolean exec_on_realize; guint idle_exec_source; ExecData *exec_data; @@ -564,7 +564,7 @@ index ae9267791461..31ede77e62db 100644 }; enum -@@ -160,6 +165,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, +@@ -156,6 +161,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, static void terminal_screen_child_exited (VteTerminal *terminal, int status); @@ -577,7 +577,7 @@ index ae9267791461..31ede77e62db 100644 static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen); -@@ -629,6 +640,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -623,6 +634,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; terminal_class->child_exited = terminal_screen_child_exited; @@ -587,7 +587,7 @@ index ae9267791461..31ede77e62db 100644 signals[PROFILE_SET] = g_signal_new (I_("profile-set"), -@@ -728,6 +742,18 @@ terminal_screen_dispose (GObject *object) +@@ -722,6 +736,18 @@ terminal_screen_dispose (GObject *object) 0, 0, NULL, NULL, screen); @@ -606,7 +606,7 @@ index ae9267791461..31ede77e62db 100644 if (priv->idle_exec_source != 0) { g_source_remove (priv->idle_exec_source); -@@ -764,6 +790,7 @@ terminal_screen_finalize (GObject *object) +@@ -758,6 +784,7 @@ terminal_screen_finalize (GObject *object) g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data); g_free (priv->uuid); @@ -614,7 +614,7 @@ index ae9267791461..31ede77e62db 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -2008,6 +2035,123 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1956,6 +1983,123 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -738,7 +738,7 @@ index ae9267791461..31ede77e62db 100644 static void terminal_screen_drag_data_received (GtkWidget *widget, GdkDragContext *context, -@@ -2353,7 +2497,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2301,7 +2445,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, if (fd == -1) return FALSE; @@ -751,10 +751,10 @@ index ae9267791461..31ede77e62db 100644 return FALSE; -- -2.24.1 +2.25.4 -From d03678bac66562b4f7d1faa7a00bf4f22c5939d1 Mon Sep 17 00:00:00 2001 +From fb674971186ce366ab4963e37b407e8fa329a48d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 10 May 2018 19:23:16 +0200 Subject: [PATCH 06/16] Notify when a long-running foreground process group @@ -768,30 +768,12 @@ notification is sent. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - configure.ac | 6 +-- src/terminal-app.c | 32 ++++++++++++ src/terminal-screen.c | 109 +++++++++++++++++++++++++++++++++++++++ src/terminal-tab-label.c | 30 ++++++++++- src/terminal-tab-label.h | 4 ++ - 5 files changed, 177 insertions(+), 4 deletions(-) + 4 files changed, 174 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 96d9efdc645c..8470ff94f704 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,9 +37,9 @@ AM_GNU_GETTEXT([external]) - - AX_PTHREAD([],[AC_MSG_ERROR([pthreads are required])]) - --GLIB_REQUIRED=2.50.0 --GLIB_MIN_REQUIRED=2.50 --GLIB_MAX_ALLOWED=2.50 -+GLIB_REQUIRED=2.52.0 -+GLIB_MIN_REQUIRED=2.52 -+GLIB_MAX_ALLOWED=2.52 - - GIO_REQUIRED=2.34.0 - GIO_UNIX_REQUIRED=2.34.0 diff --git a/src/terminal-app.c b/src/terminal-app.c index 6a4fe03f2756..4e70facf9a43 100644 --- a/src/terminal-app.c @@ -850,7 +832,7 @@ index 6a4fe03f2756..4e70facf9a43 100644 app_load_css (application); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 31ede77e62db..8262e36b8945 100644 +index 3e18c2477438..c767dccf5299 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -54,6 +54,7 @@ @@ -861,7 +843,7 @@ index 31ede77e62db..8262e36b8945 100644 #include "terminal-util.h" #include "terminal-window.h" #include "terminal-info-bar.h" -@@ -160,6 +161,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -156,6 +157,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, static gboolean terminal_screen_popup_menu (GtkWidget *widget); static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event); @@ -872,7 +854,7 @@ index 31ede77e62db..8262e36b8945 100644 static void terminal_screen_hierarchy_changed (GtkWidget *widget, GtkWidget *previous_toplevel); static void terminal_screen_child_exited (VteTerminal *terminal, -@@ -632,6 +637,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -626,6 +631,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) object_class->get_property = terminal_screen_get_property; object_class->set_property = terminal_screen_set_property; @@ -880,7 +862,7 @@ index 31ede77e62db..8262e36b8945 100644 widget_class->realize = terminal_screen_realize; widget_class->style_updated = terminal_screen_style_updated; widget_class->drag_data_received = terminal_screen_drag_data_received; -@@ -731,6 +737,10 @@ terminal_screen_dispose (GObject *object) +@@ -725,6 +731,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -891,7 +873,7 @@ index 31ede77e62db..8262e36b8945 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1939,6 +1949,45 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1887,6 +1897,45 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -937,7 +919,7 @@ index 31ede77e62db..8262e36b8945 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2083,6 +2132,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) +@@ -2031,6 +2080,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) screen); } @@ -1001,7 +983,7 @@ index 31ede77e62db..8262e36b8945 100644 static void terminal_screen_shell_precmd (VteTerminal *terminal) { -@@ -2105,6 +2211,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2053,6 +2159,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) priv->shell_preexec_source_id = 0; } @@ -1089,10 +1071,10 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.24.1 +2.25.4 -From d98a115568e8265652b2af06f82deb218f272cda Mon Sep 17 00:00:00 2001 +From a4107ba9df399d5ee8058fd36b09b6a0b064d497 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 15:39:35 +0200 Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids @@ -1106,10 +1088,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 123 insertions(+), 116 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index 6526c4ff4832..0fc1c867d42e 100644 +index 64f8295bf2b0..426993a4e154 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1962,130 +1962,137 @@ +@@ -1965,130 +1965,137 @@ True False 12 @@ -1364,10 +1346,10 @@ index 6526c4ff4832..0fc1c867d42e 100644 -- -2.24.1 +2.25.4 -From 9b68faf7eb32e680ca0261cf2353c7ebe1dc9cbf Mon Sep 17 00:00:00 2001 +From d2c6d15c0da2304b772920426405f493c1c0e682 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 10 Apr 2018 16:01:51 +0200 Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading" @@ -1380,10 +1362,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 143 insertions(+), 104 deletions(-) diff --git a/src/preferences.ui b/src/preferences.ui -index 0fc1c867d42e..70c9e6ad0bad 100644 +index 426993a4e154..7f4a94c88b6b 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1970,129 +1970,168 @@ +@@ -1973,129 +1973,168 @@ 12 6 @@ -1657,10 +1639,10 @@ index 0fc1c867d42e..70c9e6ad0bad 100644 -- -2.24.1 +2.25.4 -From eddc8eb6a8ddba7a6f4992fb3317cb04d06b97ae Mon Sep 17 00:00:00 2001 +From 12e10d8f8e9510c18ebf4a10f6d052c027a450f9 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:02:13 +0200 Subject: [PATCH 09/16] Revert "screen: Remove unused description and @@ -1675,10 +1657,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 2 files changed, 68 insertions(+) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 8262e36b8945..4882695c4ac0 100644 +index c767dccf5299..4ae5cc89002f 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -115,6 +115,7 @@ struct _TerminalScreenPrivate +@@ -111,6 +111,7 @@ struct _TerminalScreenPrivate gboolean between_preexec_and_precmd; char *current_cmdline; @@ -1686,7 +1668,7 @@ index 8262e36b8945..4882695c4ac0 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -132,6 +133,7 @@ enum { +@@ -128,6 +129,7 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -1694,7 +1676,7 @@ index 8262e36b8945..4882695c4ac0 100644 }; enum -@@ -596,6 +598,9 @@ terminal_screen_get_property (GObject *object, +@@ -590,6 +592,9 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -1704,7 +1686,7 @@ index 8262e36b8945..4882695c4ac0 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -616,6 +621,7 @@ terminal_screen_set_property (GObject *object, +@@ -610,6 +615,7 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, g_value_get_object (value)); break; case PROP_TITLE: @@ -1712,7 +1694,7 @@ index 8262e36b8945..4882695c4ac0 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -705,6 +711,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -699,6 +705,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); @@ -1726,7 +1708,7 @@ index 8262e36b8945..4882695c4ac0 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -801,6 +814,7 @@ terminal_screen_finalize (GObject *object) +@@ -795,6 +808,7 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -1734,7 +1716,7 @@ index 8262e36b8945..4882695c4ac0 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1045,6 +1059,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -1053,6 +1067,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1756,7 +1738,7 @@ index 8262e36b8945..4882695c4ac0 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1369,6 +1398,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1381,6 +1410,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1764,7 +1746,7 @@ index 8262e36b8945..4882695c4ac0 100644 } GSettings* -@@ -1713,6 +1743,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1652,6 +1682,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1773,7 +1755,7 @@ index 8262e36b8945..4882695c4ac0 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, NULL); -@@ -1988,6 +2020,35 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1936,6 +1968,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1809,7 +1791,7 @@ index 8262e36b8945..4882695c4ac0 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2041,6 +2102,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1989,6 +2050,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -1836,10 +1818,10 @@ index 8ea337867222..049bbe5a2b8b 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.24.1 +2.25.4 -From a836049fd806ce234ec0bf9984b93868622496ec Mon Sep 17 00:00:00 2001 +From 12f12cba293ca6740687def05a16510f26022d19 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 17:39:48 +0200 Subject: [PATCH 10/16] Revert "Remove the static title setting from profile @@ -1857,12 +1839,12 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 5 files changed, 91 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 0a1d8eaf5fed..79ac148ab206 100644 +index 7b04919202b7..1c458a9fb9ec 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -204,6 +204,11 @@ - Whether to perform Arabic shaping - If true, shape Arabic text. +@@ -209,6 +209,11 @@ + Whether to enable SIXEL images + If true, SIXEL sequences are parsed and images are rendered. + + 'Terminal' @@ -1873,10 +1855,10 @@ index 0a1d8eaf5fed..79ac148ab206 100644 false Whether bold is also bright diff --git a/src/preferences.ui b/src/preferences.ui -index 70c9e6ad0bad..ddfd3c604907 100644 +index 7f4a94c88b6b..f86f8c980f89 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1963,6 +1963,77 @@ +@@ -1966,6 +1966,77 @@ False 12 18 @@ -1955,10 +1937,10 @@ index 70c9e6ad0bad..ddfd3c604907 100644 True diff --git a/src/profile-editor.c b/src/profile-editor.c -index 6038a9c60949..d91887e022a7 100644 +index 35bd24791417..df1f219608c4 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c -@@ -1331,6 +1331,11 @@ profile_prefs_load (const char *uuid, GSettings *profile) +@@ -1368,6 +1368,11 @@ profile_prefs_load (const char *uuid, GSettings *profile) (GSettingsBindSetMapping) enum_to_string, terminal_preserve_working_directory_get_type, NULL); @@ -1971,10 +1953,10 @@ index 6038a9c60949..d91887e022a7 100644 gtk_builder_get_object (builder, "use-custom-command-checkbutton"), diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index c9e7c895d700..a52bfdb1b5c3 100644 +index 6bfd3e346895..cbb59a2301e6 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h -@@ -68,6 +68,7 @@ G_BEGIN_DECLS +@@ -69,6 +69,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" @@ -1983,10 +1965,10 @@ index c9e7c895d700..a52bfdb1b5c3 100644 #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY "use-system-font" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 4882695c4ac0..e0de69ccdcc2 100644 +index 4ae5cc89002f..5e473efa70ea 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1063,11 +1063,14 @@ char * +@@ -1071,11 +1071,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; @@ -2001,7 +1983,7 @@ index 4882695c4ac0..e0de69ccdcc2 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -1113,6 +1116,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1121,6 +1124,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); } @@ -2015,10 +1997,10 @@ index 4882695c4ac0..e0de69ccdcc2 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.24.1 +2.25.4 -From eeae7fd7e057e6de5cfb78fd01f960721a0c2259 Mon Sep 17 00:00:00 2001 +From c76c29e21f381885193947ff252793131aca0ed3 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 17 Feb 2015 17:06:17 +0100 Subject: [PATCH 11/16] Restore translations for setting a title and @@ -2474,10 +2456,10 @@ index 49e710859ac9..8703552984b1 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/ca.po b/po/ca.po -index d8e04df44eb7..fe8535547ebe 100644 +index 29fd5ad05de0..fc770a5b8461 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2454,3 +2454,15 @@ msgstr "Tanca la _finestra" +@@ -2472,3 +2472,15 @@ msgstr "Tanca la _finestra" #~ msgid "_Detach Tab" #~ msgstr "_Separa la pestanya" @@ -2580,7 +2562,7 @@ index 31d145f37174..ebfaaae38ecf 100644 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" diff --git a/po/de.po b/po/de.po -index a5f4846745e9..8d9a3bb05d49 100644 +index 6d4d38ca0f1c..836617110e03 100644 --- a/po/de.po +++ b/po/de.po @@ -2507,3 +2507,15 @@ msgstr "Fenster _schließen" @@ -2661,7 +2643,7 @@ index 99c9a629b472..15f683b5a625 100644 +msgid "Transparent background" +msgstr "Διάφανο παρασκήνιο" diff --git a/po/en@shaw.po b/po/en@shaw.po -index 82b2d53401b2..28f5dc02575b 100644 +index 5bdb39250e53..6fb8a7e1c3bb 100644 --- a/po/en@shaw.po +++ b/po/en@shaw.po @@ -1212,8 +1212,8 @@ msgid "_Base on:" @@ -2761,10 +2743,10 @@ index 4f75ff1425df..7edfb0a08396 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "S_hade transparent or image background:" diff --git a/po/eo.po b/po/eo.po -index 65461a57074c..b323308611f4 100644 +index 0e83b981753b..0d98ea57c90a 100644 --- a/po/eo.po +++ b/po/eo.po -@@ -2811,8 +2811,8 @@ msgstr "_Fermi la fenestron" +@@ -2827,8 +2827,8 @@ msgstr "_Fermi la fenestron" #~ msgid "_Font:" #~ msgstr "_Tiparo:" @@ -2775,7 +2757,7 @@ index 65461a57074c..b323308611f4 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Ŝalti al langeto 3" -@@ -2874,8 +2874,8 @@ msgstr "_Fermi la fenestron" +@@ -2890,8 +2890,8 @@ msgstr "_Fermi la fenestron" #~ msgid "_Input Methods" #~ msgstr "_Enigmetodoj" @@ -2787,10 +2769,10 @@ index 65461a57074c..b323308611f4 100644 #~ msgid "On the left side" #~ msgstr "Maldekstre" diff --git a/po/es.po b/po/es.po -index 2792ab4d1729..35d80bf8b1ad 100644 +index 064f3a44b933..4ac03db22a80 100644 --- a/po/es.po +++ b/po/es.po -@@ -2864,17 +2864,17 @@ msgstr "_Cerrar ventana" +@@ -2876,17 +2876,17 @@ msgstr "_Cerrar ventana" #~ msgid "Default size:" #~ msgstr "Tamaño predeterminado:" @@ -2814,7 +2796,7 @@ index 2792ab4d1729..35d80bf8b1ad 100644 #~ msgid "Current Locale" #~ msgstr "Configuración regional actual" -@@ -3700,8 +3700,8 @@ msgstr "_Cerrar ventana" +@@ -3712,8 +3712,8 @@ msgstr "_Cerrar ventana" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -2837,10 +2819,10 @@ index 4b1c2a7c67e4..770761168806 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index c37a2b2c6de2..e982592eb140 100644 +index f65fad2d0193..8b299a678e1a 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2306,3 +2306,15 @@ msgstr "It_xi leihoa" +@@ -2321,3 +2321,15 @@ msgstr "It_xi leihoa" #~ msgid "_Detach Tab" #~ msgstr "_Desuztartu fitxa" @@ -2857,10 +2839,10 @@ index c37a2b2c6de2..e982592eb140 100644 +msgid "Transparent background" +msgstr "Atzeko plano gardena" diff --git a/po/fa.po b/po/fa.po -index 01b58df6b687..c5c7c3c7c35b 100644 +index 2035684dc810..ba9f72b6a7f1 100644 --- a/po/fa.po +++ b/po/fa.po -@@ -2716,8 +2716,8 @@ msgstr "_بستن پنجره" +@@ -2761,8 +2761,8 @@ msgstr "_بستن پنجره" #~ msgid "Use custom default terminal si_ze" #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض" @@ -2871,7 +2853,7 @@ index 01b58df6b687..c5c7c3c7c35b 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:" -@@ -2731,8 +2731,8 @@ msgstr "_بستن پنجره" +@@ -2776,8 +2776,8 @@ msgstr "_بستن پنجره" #~ msgid "_Unlimited" #~ msgstr "_نامحدود" @@ -2882,7 +2864,7 @@ index 01b58df6b687..c5c7c3c7c35b 100644 #~ msgid "Switch to Tab 3" #~ msgstr "تعویض به زبانه‌ی ۳" -@@ -2773,5 +2773,8 @@ msgstr "_بستن پنجره" +@@ -2818,5 +2818,8 @@ msgstr "_بستن پنجره" #~ msgid "_Input Methods" #~ msgstr "روش‌های _ورودی" @@ -2920,10 +2902,10 @@ index 056943256725..bbb7ade1bb6b 100644 +msgid "Set Title" +msgstr "Aseta otsikko" diff --git a/po/fr.po b/po/fr.po -index bb0f3b03db93..1e384d03c6db 100644 +index f49a3c83426f..cb0c4a8e515a 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2485,3 +2485,15 @@ msgstr "Fermer _la fenêtre" +@@ -2500,3 +2500,15 @@ msgstr "Fermer _la fenêtre" #~ msgid "_Detach Tab" #~ msgstr "_Détacher l’onglet" @@ -2940,10 +2922,10 @@ index bb0f3b03db93..1e384d03c6db 100644 +msgid "Set Title" +msgstr "Définir le titre" diff --git a/po/fur.po b/po/fur.po -index d8e254f5545a..21158b2fa64c 100644 +index 50973f59bc2c..2d6e44fc4710 100644 --- a/po/fur.po +++ b/po/fur.po -@@ -466,6 +466,10 @@ msgstr "" +@@ -539,6 +539,10 @@ msgstr "" msgid "Which encoding to use" msgstr "Codifiche di doprâ" @@ -2951,10 +2933,10 @@ index d8e254f5545a..21158b2fa64c 100644 +msgid "Transparent background" +msgstr "Fondâl trasparent" + - #: ../src/org.gnome.Terminal.gschema.xml.h:70 + #: src/org.gnome.Terminal.gschema.xml:345 msgid "" "Whether ambiguous-width characters are narrow or wide when using UTF-8 " -@@ -3427,6 +3431,9 @@ msgstr "_Siere barcon" +@@ -3536,6 +3540,9 @@ msgstr "_Siere barcon" #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgstr "Il test fracât nol samee jessi un OTP challenge." @@ -2964,7 +2946,7 @@ index d8e254f5545a..21158b2fa64c 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Passe a la schede 3" -@@ -3482,8 +3489,8 @@ msgstr "_Siere barcon" +@@ -3591,8 +3598,8 @@ msgstr "_Siere barcon" #~ msgid "_Input Methods" #~ msgstr "_Cemût inserî test" @@ -3247,10 +3229,10 @@ index e08dfae8009c..b224bbdc1f3a 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index 557d85dbd201..c89c4e533d3f 100644 +index e757d438fa46..0dd629281491 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2484,3 +2484,15 @@ msgstr "ウィンドウを閉じる(_L)" +@@ -2495,3 +2495,15 @@ msgstr "ウィンドウを閉じる(_L)" #~ msgid "_Incremental Search…" #~ msgstr "インクリメンタル検索(_I)…" @@ -3291,10 +3273,10 @@ index e0dd79f280a2..887d395ce150 100644 #: ../src/gnome-terminal.glade2.h:87 diff --git a/po/kk.po b/po/kk.po -index ac7eff8587dc..258d7de5cb46 100644 +index 623463c9fa89..730f7c769755 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2557,3 +2557,15 @@ msgstr "Терезені жа_бу" +@@ -2701,3 +2701,15 @@ msgstr "Терезені жа_бу" #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -3409,10 +3391,10 @@ index bc2bb7f03de4..d2a83a007097 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index 6fc6ac62c742..d57a5bde8007 100644 +index d02997c9e0c3..1b898ae85b9d 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2715,3 +2715,15 @@ msgstr "_Užverti langą" +@@ -2729,3 +2729,15 @@ msgstr "_Užverti langą" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -3714,10 +3696,10 @@ index 4fe16cc88a9a..53fb89134be0 100644 #~ msgid "" #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" diff --git a/po/nl.po b/po/nl.po -index 005ec063a4bb..4f6a56a1cffa 100644 +index 5b3caeaa9a25..420cb4c8d936 100644 --- a/po/nl.po +++ b/po/nl.po -@@ -2747,3 +2747,15 @@ msgstr "Venster sl_uiten" +@@ -2750,3 +2750,15 @@ msgstr "Venster sl_uiten" #~ msgid "_Add or Remove…" #~ msgstr "_Toevoegen of verwijderen…" @@ -3971,10 +3953,10 @@ index d5f10e4f2cbd..cd2f908fb579 100644 +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index c6b971edd35a..ff9162de3d01 100644 +index 5ac49a0cd0d6..f09b96ec6e60 100644 --- a/po/ro.po +++ b/po/ro.po -@@ -3485,8 +3485,8 @@ msgstr "Î_nchide fereastra" +@@ -3501,8 +3501,8 @@ msgstr "Î_nchide fereastra" #~ msgid "_Solid color" #~ msgstr "Culoare _solidă" @@ -4057,7 +4039,7 @@ index adca7d5acba9..6379cee7f0a3 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/sk.po b/po/sk.po -index 06ffff4ee055..ab62c01f8f85 100644 +index e4f9a101fbf5..ad840d8829d0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3048,3 +3048,15 @@ msgstr "_Zavrieť okno" @@ -4077,10 +4059,10 @@ index 06ffff4ee055..ab62c01f8f85 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index 0123d280c9b3..529f0452bcd0 100644 +index a04bcee488b1..b96df7bd9359 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2809,17 +2809,17 @@ msgstr "_Zapri okno" +@@ -2824,17 +2824,17 @@ msgstr "_Zapri okno" #~ msgid "Default size:" #~ msgstr "Privzeta velikost:" @@ -4104,7 +4086,7 @@ index 0123d280c9b3..529f0452bcd0 100644 #~ msgid "Current Locale" #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2934,3 +2934,6 @@ msgstr "_Zapri okno" +@@ -2949,3 +2949,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -4242,10 +4224,10 @@ index 45dbad07fba7..852c47cc6ee5 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 47810e8ed084..58785b0cb82f 100644 +index 8ffe3c688434..05389390c925 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2710,5 +2710,17 @@ msgstr "Stän_g fönster" +@@ -2725,5 +2725,17 @@ msgstr "Stän_g fönster" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -4513,10 +4495,10 @@ index 313f76b98eae..be6089762082 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/uk.po b/po/uk.po -index a7eb5ab5b9c1..9c6667ba0399 100644 +index 436f7ee4f283..861b6a726ba0 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -2399,3 +2399,18 @@ msgstr "" +@@ -2408,3 +2408,18 @@ msgstr "" #: src/terminal-window.c:3224 msgid "C_lose Window" msgstr "Закр_ити вікно" @@ -4654,10 +4636,10 @@ index cb78ec67db2d..a4f3b4ddcfb6 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/zh_CN.po b/po/zh_CN.po -index 76110839f611..c2fd7ce5fd50 100644 +index 1b60c64c9238..abeee10d082c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2599,17 +2599,17 @@ msgstr "关闭窗口(_L)" +@@ -2741,17 +2741,17 @@ msgstr "关闭窗口(_L)" #~ msgid "Default size:" #~ msgstr "默认大小：" @@ -4681,7 +4663,7 @@ index 76110839f611..c2fd7ce5fd50 100644 #~ msgid "Current Locale" #~ msgstr "当前区域" -@@ -2722,3 +2722,6 @@ msgstr "关闭窗口(_L)" +@@ -2864,3 +2864,6 @@ msgstr "关闭窗口(_L)" #~ msgid "_Find..." #~ msgstr "查找(_F)..." @@ -4724,10 +4706,10 @@ index 61153529f0c7..c366abddd1af 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 0ef3bb80be49..5c162706fa7b 100644 +index fd2360678454..5792c58a64f3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po -@@ -2710,17 +2710,17 @@ msgstr "關閉視窗(_L)" +@@ -2723,17 +2723,17 @@ msgstr "關閉視窗(_L)" #~ msgid "Default size:" #~ msgstr "預設大小：" @@ -4751,7 +4733,7 @@ index 0ef3bb80be49..5c162706fa7b 100644 #~ msgid "Current Locale" #~ msgstr "目前的地區設定" -@@ -2932,3 +2932,6 @@ msgstr "關閉視窗(_L)" +@@ -2945,3 +2945,6 @@ msgstr "關閉視窗(_L)" #~ msgid "Show session management options" #~ msgstr "顯示作業階段管理選項" @@ -4759,10 +4741,10 @@ index 0ef3bb80be49..5c162706fa7b 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.24.1 +2.25.4 -From 0cca135c93c2987c6d73dd72fb120bc0456eed01 Mon Sep 17 00:00:00 2001 +From ea71444c359aae016a51c4c1fcce99f575bbe562 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 25 May 2016 13:47:36 +0200 Subject: [PATCH 12/16] Restore the action and shortcut to set a static title @@ -4779,10 +4761,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 3 files changed, 81 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 79ac148ab206..0eeb141694b1 100644 +index 1c458a9fb9ec..c649e988b5cf 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -424,6 +424,10 @@ +@@ -429,6 +429,10 @@ 'disabled' Keyboard shortcut to toggle the read-only state @@ -4907,10 +4889,10 @@ index c0219d872725..61c5e7de350a 100644 { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, -- -2.24.1 +2.25.4 -From ebd04f8228b970bab8243cc834a8ef72b3623f76 Mon Sep 17 00:00:00 2001 +From 910e1d1de39c09dd70f673f4a899a05005d9fa7d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 18:14:36 +0200 Subject: [PATCH 13/16] screen: Style fix @@ -4924,10 +4906,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index e0de69ccdcc2..34893704a607 100644 +index 5e473efa70ea..b2fbf72dbde9 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -837,7 +837,7 @@ terminal_screen_new (GSettings *profile, +@@ -831,7 +831,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ @@ -4937,10 +4919,10 @@ index e0de69ccdcc2..34893704a607 100644 const char *p; -- -2.24.1 +2.25.4 -From 396944ed8cd28599e879d8aa7dc763711a2a1276 Mon Sep 17 00:00:00 2001 +From 69bbb3c0f5533d8e0b14bfa13cb08fcc08f19079 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 30 Jun 2016 16:58:15 +0200 Subject: [PATCH 14/16] Restore the rest of the title handling options and make @@ -4962,7 +4944,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 8 files changed, 263 insertions(+), 74 deletions(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 0eeb141694b1..bca411f7bcc7 100644 +index c649e988b5cf..53083a0e15d3 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -4979,9 +4961,9 @@ index 0eeb141694b1..bca411f7bcc7 100644 -@@ -204,6 +211,11 @@ - Whether to perform Arabic shaping - If true, shape Arabic text. +@@ -209,6 +216,11 @@ + Whether to enable SIXEL images + If true, SIXEL sequences are parsed and images are rendered. + + 'replace' @@ -4992,10 +4974,10 @@ index 0eeb141694b1..bca411f7bcc7 100644 'Terminal' Title for terminal diff --git a/src/preferences.ui b/src/preferences.ui -index ddfd3c604907..c7ef0bb2be15 100644 +index f86f8c980f89..c45366ae52fc 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1999,7 +1999,7 @@ +@@ -2002,7 +2002,7 @@ True False 0 @@ -5004,7 +4986,7 @@ index ddfd3c604907..c7ef0bb2be15 100644 True title-entry -@@ -2019,6 +2019,37 @@ +@@ -2022,6 +2022,37 @@ 1 @@ -5043,10 +5025,10 @@ index ddfd3c604907..c7ef0bb2be15 100644 diff --git a/src/profile-editor.c b/src/profile-editor.c -index d91887e022a7..15e8bd729d28 100644 +index df1f219608c4..1aa05fb33a92 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c -@@ -1336,6 +1336,15 @@ profile_prefs_load (const char *uuid, GSettings *profile) +@@ -1373,6 +1373,15 @@ profile_prefs_load (const char *uuid, GSettings *profile) gtk_builder_get_object (builder, "title-entry"), "text", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); @@ -5082,10 +5064,10 @@ index 93f1460c2207..5e816f71c10e 100644 { TERMINAL_EXIT_CLOSE, diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index a52bfdb1b5c3..d03c983ed858 100644 +index cbb59a2301e6..78e7a9a54b60 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h -@@ -68,6 +68,7 @@ G_BEGIN_DECLS +@@ -69,6 +69,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" @@ -5094,10 +5076,10 @@ index a52bfdb1b5c3..d03c983ed858 100644 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #define TERMINAL_PROFILE_USE_SKEY_KEY "use-skey" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 34893704a607..a5f4d653b524 100644 +index b2fbf72dbde9..296fb1fead2d 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -114,8 +114,11 @@ struct _TerminalScreenPrivate +@@ -110,8 +110,11 @@ struct _TerminalScreenPrivate ExecData *exec_data; gboolean between_preexec_and_precmd; @@ -5110,7 +5092,7 @@ index 34893704a607..a5f4d653b524 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -132,8 +135,7 @@ enum +@@ -128,8 +131,7 @@ enum enum { PROP_0, PROP_PROFILE, @@ -5120,7 +5102,7 @@ index 34893704a607..a5f4d653b524 100644 }; enum -@@ -183,8 +185,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal +@@ -179,8 +181,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal static void update_color_scheme (TerminalScreen *screen); @@ -5134,7 +5116,7 @@ index 34893704a607..a5f4d653b524 100644 static void terminal_screen_check_extra (TerminalScreen *screen, GdkEvent *event, char **number_info); -@@ -565,6 +572,9 @@ terminal_screen_init (TerminalScreen *screen) +@@ -559,6 +566,9 @@ terminal_screen_init (TerminalScreen *screen) gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); @@ -5144,7 +5126,7 @@ index 34893704a607..a5f4d653b524 100644 g_signal_connect (screen, "window-title-changed", G_CALLBACK (terminal_screen_window_title_changed), screen); -@@ -598,9 +608,6 @@ terminal_screen_get_property (GObject *object, +@@ -592,9 +602,6 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -5154,7 +5136,7 @@ index 34893704a607..a5f4d653b524 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -621,7 +628,6 @@ terminal_screen_set_property (GObject *object, +@@ -615,7 +622,6 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, g_value_get_object (value)); break; case PROP_TITLE: @@ -5162,7 +5144,7 @@ index 34893704a607..a5f4d653b524 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -711,13 +717,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -705,13 +711,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) NULL, G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); @@ -5176,7 +5158,7 @@ index 34893704a607..a5f4d653b524 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -814,7 +813,9 @@ terminal_screen_finalize (GObject *object) +@@ -808,7 +807,9 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -5187,7 +5169,7 @@ index 34893704a607..a5f4d653b524 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -834,28 +835,8 @@ terminal_screen_new (GSettings *profile, +@@ -828,28 +829,8 @@ terminal_screen_new (GSettings *profile, g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_COLUMNS_KEY), g_settings_get_int (profile, TERMINAL_PROFILE_DEFAULT_SIZE_ROWS_KEY)); @@ -5218,7 +5200,7 @@ index 34893704a607..a5f4d653b524 100644 vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom); terminal_screen_set_font (screen); -@@ -1053,28 +1034,139 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -1061,28 +1042,139 @@ terminal_screen_exec (TerminalScreen *screen, return TRUE; } @@ -5369,7 +5351,7 @@ index 34893704a607..a5f4d653b524 100644 } static void -@@ -1117,9 +1209,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1125,9 +1217,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5381,7 +5363,7 @@ index 34893704a607..a5f4d653b524 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1407,7 +1500,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1419,7 +1512,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5389,7 +5371,7 @@ index 34893704a607..a5f4d653b524 100644 } GSettings* -@@ -1752,8 +1844,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1691,8 +1783,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5398,7 +5380,7 @@ index 34893704a607..a5f4d653b524 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, NULL); -@@ -2029,33 +2119,45 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1977,33 +2067,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5458,7 +5440,7 @@ index 34893704a607..a5f4d653b524 100644 } /** -@@ -2088,7 +2190,9 @@ static void +@@ -2036,7 +2138,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5469,7 +5451,7 @@ index 34893704a607..a5f4d653b524 100644 } static void -@@ -2111,8 +2215,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2059,8 +2163,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -5478,7 +5460,7 @@ index 34893704a607..a5f4d653b524 100644 action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); switch (action) -@@ -2156,6 +2258,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2104,6 +2206,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5554,10 +5536,10 @@ index 61c5e7de350a..0d61db3c125d 100644 static void -- -2.24.1 +2.25.4 -From 514d426d0aa0362d170e8470e68bee991fc63858 Mon Sep 17 00:00:00 2001 +From 26bcbb1ed2d7c2f7ca0d004acca9893e07f0b322 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Wed, 3 Apr 2019 15:38:09 +0200 Subject: [PATCH 15/16] Update the title with the current foreground process @@ -5572,10 +5554,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index bca411f7bcc7..630647c75301 100644 +index 53083a0e15d3..d7e12d831796 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml -@@ -270,6 +270,11 @@ +@@ -275,6 +275,11 @@ Whether to scroll to the bottom when there’s new output If true, whenever there’s new output the terminal will scroll to the bottom. @@ -5588,10 +5570,10 @@ index bca411f7bcc7..630647c75301 100644 'close' What to do with the terminal when the child command exits diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index d03c983ed858..8d8b34fdbbab 100644 +index 78e7a9a54b60..88dd11254c0d 100644 --- a/src/terminal-schemas.h +++ b/src/terminal-schemas.h -@@ -67,6 +67,7 @@ G_BEGIN_DECLS +@@ -68,6 +68,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy" #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" @@ -5600,10 +5582,10 @@ index d03c983ed858..8d8b34fdbbab 100644 #define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode" #define TERMINAL_PROFILE_TITLE_KEY "title" diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index a5f4d653b524..21bbac0dacf9 100644 +index 296fb1fead2d..2ebbbbd10b69 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -113,7 +113,9 @@ struct _TerminalScreenPrivate +@@ -109,7 +109,9 @@ struct _TerminalScreenPrivate guint idle_exec_source; ExecData *exec_data; @@ -5613,7 +5595,7 @@ index a5f4d653b524..21bbac0dacf9 100644 gboolean user_title; /* title was manually set */ char *current_cmdline; char *raw_title; -@@ -1149,6 +1151,20 @@ terminal_screen_format_title (TerminalScreen *screen, +@@ -1157,6 +1159,20 @@ terminal_screen_format_title (TerminalScreen *screen, add_sep = FALSE; } @@ -5634,7 +5616,7 @@ index a5f4d653b524..21bbac0dacf9 100644 if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) { g_free (*titleptr); -@@ -1178,6 +1194,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1186,6 +1202,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, GObject *object = G_OBJECT (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen); TerminalWindow *window; @@ -5642,7 +5624,7 @@ index a5f4d653b524..21bbac0dacf9 100644 g_object_freeze_notify (object); -@@ -1212,7 +1229,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1220,7 +1237,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) || prop_name == I_(TERMINAL_PROFILE_TITLE_KEY)) { @@ -5651,7 +5633,7 @@ index a5f4d653b524..21bbac0dacf9 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1240,6 +1257,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1248,6 +1265,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) update_color_scheme (screen); @@ -5665,7 +5647,7 @@ index a5f4d653b524..21bbac0dacf9 100644 if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY)); -@@ -1300,6 +1324,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1312,6 +1336,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); } @@ -5675,7 +5657,7 @@ index a5f4d653b524..21bbac0dacf9 100644 g_object_thaw_notify (object); } -@@ -2190,6 +2217,9 @@ static void +@@ -2138,6 +2165,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5685,7 +5667,7 @@ index a5f4d653b524..21bbac0dacf9 100644 terminal_screen_set_dynamic_title (screen, vte_terminal_get_window_title (vte_terminal), FALSE); -@@ -2296,6 +2326,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) +@@ -2244,6 +2274,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) priv->current_cmdline = g_steal_pointer (&cmdline); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); @@ -5694,7 +5676,7 @@ index a5f4d653b524..21bbac0dacf9 100644 out: priv->contents_changed_source_id = 0; return G_SOURCE_REMOVE; -@@ -2388,6 +2420,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2336,6 +2368,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); @@ -5702,7 +5684,7 @@ index a5f4d653b524..21bbac0dacf9 100644 priv->between_preexec_and_precmd = FALSE; if (priv->contents_changed_source_id != 0) -@@ -2407,6 +2440,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2355,6 +2388,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) g_clear_pointer (&priv->current_cmdline, g_free); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n"); @@ -5711,7 +5693,7 @@ index a5f4d653b524..21bbac0dacf9 100644 } static gboolean -@@ -2427,6 +2462,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) +@@ -2375,6 +2410,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) priv->current_cmdline = g_steal_pointer (&cmdline); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); @@ -5721,10 +5703,10 @@ index a5f4d653b524..21bbac0dacf9 100644 retval = G_SOURCE_REMOVE; -- -2.24.1 +2.25.4 -From f92b1bda7ecde7a3a8f9a53345d44b5a7ecf8c2f Mon Sep 17 00:00:00 2001 +From 38af1f795557034ef35695a12555253486e3ea7d Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Thu, 27 Feb 2020 19:32:08 +0100 Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any @@ -5734,16 +5716,16 @@ advertises the name of the current toolbox container. https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 --- - src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- + src/terminal-screen.c | 37 ++++++++++++++++++++++++++++++++++--- src/terminal-screen.h | 6 ++++++ src/terminal-window.c | 26 ++++++++++++++++++++++++-- - 3 files changed, 59 insertions(+), 3 deletions(-) + 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 21bbac0dacf9..aadc67fc1d47 100644 +index 2ebbbbd10b69..9c42798e4b86 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -881,6 +881,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -875,6 +875,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, TerminalScreen *parent_screen, GCancellable *cancellable, GError **error) @@ -5769,12 +5751,15 @@ index 21bbac0dacf9..aadc67fc1d47 100644 { g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); -@@ -892,8 +911,17 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, - terminal_unref_exec_data ExecData* data = exec_data_clone (parent_screen->priv->exec_data, FALSE); +@@ -885,15 +904,27 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, + gs_free char* cwd = terminal_screen_get_current_dir (parent_screen); ++ terminal_unref_exec_data ExecData* data = NULL; + if (override_command != NULL) + { ++ data = exec_data_clone (parent_screen->priv->exec_data); ++ + g_strfreev (data->argv); + data->argv = g_strdupv (override_command); + @@ -5788,6 +5773,15 @@ index 21bbac0dacf9..aadc67fc1d47 100644 screen, parent_screen, cwd); + + return terminal_screen_reexec_from_exec_data (screen, +- NULL /* exec data */, +- NULL /* envv */, ++ data, ++ parent_screen->priv->exec_data->envv, + cwd, + cancellable, + error); diff --git a/src/terminal-screen.h b/src/terminal-screen.h index 5b7fcc59ddd0..5b1f983a7049 100644 --- a/src/terminal-screen.h @@ -5843,5 +5837,5 @@ index 0d61db3c125d..ad3a95af7008 100644 if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW) gtk_window_present (GTK_WINDOW (window)); -- -2.24.1 +2.25.4 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index d680874..07ebf18 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -2,23 +2,24 @@ %global gettext_version 0.19.8 %define glib2_version 2.52.0 -%define gtk3_version 3.22.27 -%define vte_version 0.60.1 +%define gtk3_version 3.24.0 +%define vte_version 0.61.90 %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.36.2 +Version: 3.37.90 Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/gnome-terminal/3.36/gnome-terminal-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-terminal/3.37/gnome-terminal-%{version}.tar.xz Source1: org.gnome.Terminal.gschema.override Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch +BuildRequires: docbook-style-xsl BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gsettings-desktop-schemas-devel @@ -29,6 +30,7 @@ BuildRequires: autoconf automake libtool BuildRequires: itstool BuildRequires: dconf-devel BuildRequires: libuuid-devel +BuildRequires: libxslt BuildRequires: nautilus-devel BuildRequires: gnome-shell BuildRequires: pcre2-devel @@ -100,6 +102,7 @@ make check %{_datadir}/gnome-shell %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg +%{_datadir}/man/man1/gnome-terminal.1* %{_userunitdir}/gnome-terminal-server.service %files nautilus @@ -107,6 +110,10 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Sat Sep 26 2020 Debarshi Ray - 3.37.90-1 +- Update to 3.37.90 +- Rebase the patches + * Fri Sep 25 2020 Debarshi Ray - 3.36.2-1 - Update to 3.36.2 - Rebase the patches diff --git a/sources b/sources index 1a88707..1b49ef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.36.2.tar.xz) = 0d691452456dd495b812332f206b6f8a590f67d47a6afce582b2ff0587747c36cb1eaf249080c6a3c3540ef22a50628801165d6c17eeb1b821eea1e244f79a91 +SHA512 (gnome-terminal-3.37.90.tar.xz) = b0a14c372e896c1b959b3efe3c088a5e5d8f5678d089b6e8f98ae2da6be61408448f0afd16c97d3248a6963f9329b4833648148dae59ced796c4a8e4f9f39363