diff --git a/.gitignore b/.gitignore index 65c35f8..bf0670b 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.36.0.1.tar.xz /gnome-terminal-3.36.1.tar.xz /gnome-terminal-3.36.1.1.tar.xz +/gnome-terminal-3.36.2.tar.xz diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index 0ac3a8f..8bfdb8c 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,4 +1,4 @@ -From 81806dda39f0c8c42f009534f0f7c8ea2adbe263 Mon Sep 17 00:00:00 2001 +From eaf850b3aa0bb1a997966efbd7a194d770b8e640 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 @@ -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 33fbb5dfbdb9..1a6ec56f8f5f 100644 +index 1b70094c4cbc..643525af489d 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1058,7 +1058,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1064,7 +1064,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 33fbb5dfbdb9..1a6ec56f8f5f 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1139,6 +1141,8 @@ update_color_scheme (TerminalScreen *screen) +@@ -1145,6 +1147,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 33fbb5dfbdb9..1a6ec56f8f5f 100644 gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -1182,6 +1186,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -1188,6 +1192,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 33fbb5dfbdb9..1a6ec56f8f5f 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1189,6 +1205,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -1195,6 +1211,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); @@ -234,7 +234,7 @@ index 7a8953c50388..a3d77bf6719d 100644 2.24.1 -From d28e50c368947701929b7572a2227e03683fa4d5 Mon Sep 17 00:00:00 2001 +From 91d49dfc366704298e08ca53dbf98d8fb8a63e69 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 @@ -296,7 +296,7 @@ index a3d77bf6719d..36d155a9e420 100644 2.24.1 -From edcd4a939930d43593266632962ca7ec80a57cc1 Mon Sep 17 00:00:00 2001 +From bb3745c7758c6b01462d11b97200fea4247a6daf 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 1a6ec56f8f5f..5b5556cd8b2f 100644 +index 643525af489d..655b6f541b18 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -154,6 +154,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -155,6 +155,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 1a6ec56f8f5f..5b5556cd8b2f 100644 static void terminal_screen_child_exited (VteTerminal *terminal, int status); -@@ -620,6 +622,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -624,6 +626,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 1a6ec56f8f5f..5b5556cd8b2f 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -1126,6 +1129,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1132,6 +1135,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -362,7 +362,7 @@ index 1a6ec56f8f5f..5b5556cd8b2f 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -1141,7 +1170,6 @@ update_color_scheme (TerminalScreen *screen) +@@ -1147,7 +1176,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 1a6ec56f8f5f..5b5556cd8b2f 100644 gboolean transparent; gboolean use_theme_colors; -@@ -1206,9 +1234,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -1212,9 +1240,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 1a6ec56f8f5f..5b5556cd8b2f 100644 } static void -@@ -1791,6 +1817,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1797,6 +1823,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -431,7 +431,7 @@ index 36d155a9e420..c0219d872725 100644 2.24.1 -From 2b2eccb051d01c6ab946bdc06af389347b17f223 Mon Sep 17 00:00:00 2001 +From 59aab89647482a062cb58ee4288caa5913476ef8 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 5b5556cd8b2f..64600e7c3eef 100644 +index 655b6f541b18..ae9267791461 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -2378,7 +2378,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2384,7 +2384,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)) @@ -501,7 +501,7 @@ index 5b5556cd8b2f..64600e7c3eef 100644 2.24.1 -From 305bebdea811a65da0bb901198e8842aa1f5308f Mon Sep 17 00:00:00 2001 +From f86ab4c8f8124943824716f3bebda4555d662448 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 64600e7c3eef..ec2de21b76d0 100644 +index ae9267791461..31ede77e62db 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -110,6 +110,11 @@ struct _TerminalScreenPrivate +@@ -111,6 +111,11 @@ struct _TerminalScreenPrivate gboolean exec_on_realize; guint idle_exec_source; ExecData *exec_data; @@ -564,7 +564,7 @@ index 64600e7c3eef..ec2de21b76d0 100644 }; enum -@@ -159,6 +164,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, +@@ -160,6 +165,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, static void terminal_screen_child_exited (VteTerminal *terminal, int status); @@ -577,7 +577,7 @@ index 64600e7c3eef..ec2de21b76d0 100644 static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen); -@@ -625,6 +636,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -629,6 +640,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 64600e7c3eef..ec2de21b76d0 100644 signals[PROFILE_SET] = g_signal_new (I_("profile-set"), -@@ -724,6 +738,18 @@ terminal_screen_dispose (GObject *object) +@@ -728,6 +742,18 @@ terminal_screen_dispose (GObject *object) 0, 0, NULL, NULL, screen); @@ -606,7 +606,7 @@ index 64600e7c3eef..ec2de21b76d0 100644 if (priv->idle_exec_source != 0) { g_source_remove (priv->idle_exec_source); -@@ -760,6 +786,7 @@ terminal_screen_finalize (GObject *object) +@@ -764,6 +790,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 64600e7c3eef..ec2de21b76d0 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -2002,6 +2029,123 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2008,6 +2035,123 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -738,7 +738,7 @@ index 64600e7c3eef..ec2de21b76d0 100644 static void terminal_screen_drag_data_received (GtkWidget *widget, GdkDragContext *context, -@@ -2347,7 +2491,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2353,7 +2497,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, if (fd == -1) return FALSE; @@ -754,7 +754,7 @@ index 64600e7c3eef..ec2de21b76d0 100644 2.24.1 -From a9560cd5e73b25536ea4417c7fd9accc564a018e Mon Sep 17 00:00:00 2001 +From d03678bac66562b4f7d1faa7a00bf4f22c5939d1 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 @@ -776,7 +776,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 5 files changed, 177 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 6ac5290ab887..81196250dbbc 100644 +index 96d9efdc645c..8470ff94f704 100644 --- a/configure.ac +++ b/configure.ac @@ -37,9 +37,9 @@ AM_GNU_GETTEXT([external]) @@ -850,7 +850,7 @@ index 6a4fe03f2756..4e70facf9a43 100644 app_load_css (application); diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index ec2de21b76d0..bb3903e6f888 100644 +index 31ede77e62db..8262e36b8945 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c @@ -54,6 +54,7 @@ @@ -861,7 +861,7 @@ index ec2de21b76d0..bb3903e6f888 100644 #include "terminal-util.h" #include "terminal-window.h" #include "terminal-info-bar.h" -@@ -159,6 +160,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -160,6 +161,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 +872,7 @@ index ec2de21b76d0..bb3903e6f888 100644 static void terminal_screen_hierarchy_changed (GtkWidget *widget, GtkWidget *previous_toplevel); static void terminal_screen_child_exited (VteTerminal *terminal, -@@ -628,6 +633,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -632,6 +637,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 +880,7 @@ index ec2de21b76d0..bb3903e6f888 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; -@@ -727,6 +733,10 @@ terminal_screen_dispose (GObject *object) +@@ -731,6 +737,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -891,7 +891,7 @@ index ec2de21b76d0..bb3903e6f888 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1933,6 +1943,45 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1939,6 +1949,45 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -937,7 +937,7 @@ index ec2de21b76d0..bb3903e6f888 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2077,6 +2126,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) +@@ -2083,6 +2132,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) screen); } @@ -1001,7 +1001,7 @@ index ec2de21b76d0..bb3903e6f888 100644 static void terminal_screen_shell_precmd (VteTerminal *terminal) { -@@ -2099,6 +2205,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2105,6 +2211,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) priv->shell_preexec_source_id = 0; } @@ -1092,7 +1092,7 @@ index 20cfbceb36b0..a987025e0524 100644 2.24.1 -From 142baf4c629fca34a43694d65b5d77df8a9ee680 Mon Sep 17 00:00:00 2001 +From d98a115568e8265652b2af06f82deb218f272cda 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 @@ -1367,7 +1367,7 @@ index 6526c4ff4832..0fc1c867d42e 100644 2.24.1 -From 0a541803b51597536b40a89bd79cda12d7d241c7 Mon Sep 17 00:00:00 2001 +From 9b68faf7eb32e680ca0261cf2353c7ebe1dc9cbf 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" @@ -1660,7 +1660,7 @@ index 0fc1c867d42e..70c9e6ad0bad 100644 2.24.1 -From 1b74aab4dc06705c2097630188e98cee3c3345f8 Mon Sep 17 00:00:00 2001 +From eddc8eb6a8ddba7a6f4992fb3317cb04d06b97ae 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 +1675,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 bb3903e6f888..16d2ef49eef6 100644 +index 8262e36b8945..4882695c4ac0 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -114,6 +114,7 @@ struct _TerminalScreenPrivate +@@ -115,6 +115,7 @@ struct _TerminalScreenPrivate gboolean between_preexec_and_precmd; char *current_cmdline; @@ -1686,7 +1686,7 @@ index bb3903e6f888..16d2ef49eef6 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -131,6 +132,7 @@ enum { +@@ -132,6 +133,7 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -1694,7 +1694,7 @@ index bb3903e6f888..16d2ef49eef6 100644 }; enum -@@ -592,6 +594,9 @@ terminal_screen_get_property (GObject *object, +@@ -596,6 +598,9 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -1704,7 +1704,7 @@ index bb3903e6f888..16d2ef49eef6 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -612,6 +617,7 @@ terminal_screen_set_property (GObject *object, +@@ -616,6 +621,7 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, g_value_get_object (value)); break; case PROP_TITLE: @@ -1712,7 +1712,7 @@ index bb3903e6f888..16d2ef49eef6 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -701,6 +707,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -705,6 +711,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 +1726,7 @@ index bb3903e6f888..16d2ef49eef6 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -797,6 +810,7 @@ terminal_screen_finalize (GObject *object) +@@ -801,6 +814,7 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -1734,7 +1734,7 @@ index bb3903e6f888..16d2ef49eef6 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1039,6 +1053,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -1045,6 +1059,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1756,7 +1756,7 @@ index bb3903e6f888..16d2ef49eef6 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1363,6 +1392,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1369,6 +1398,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1764,7 +1764,7 @@ index bb3903e6f888..16d2ef49eef6 100644 } GSettings* -@@ -1707,6 +1737,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1713,6 +1743,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1773,7 +1773,7 @@ index bb3903e6f888..16d2ef49eef6 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, NULL); -@@ -1982,6 +2014,35 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1988,6 +2020,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1809,7 +1809,7 @@ index bb3903e6f888..16d2ef49eef6 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2035,6 +2096,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2041,6 +2102,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -1839,7 +1839,7 @@ index 8ea337867222..049bbe5a2b8b 100644 2.24.1 -From 3cc854c356fcc7fbc74e2b7e0b9a0c7fdf9156bd Mon Sep 17 00:00:00 2001 +From a836049fd806ce234ec0bf9984b93868622496ec 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 @@ -1983,10 +1983,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 16d2ef49eef6..63cc33a2b29c 100644 +index 4882695c4ac0..e0de69ccdcc2 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -1057,11 +1057,14 @@ char * +@@ -1063,11 +1063,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; @@ -2001,7 +2001,7 @@ index 16d2ef49eef6..63cc33a2b29c 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -1107,6 +1110,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1113,6 +1116,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); } @@ -2018,7 +2018,7 @@ index 16d2ef49eef6..63cc33a2b29c 100644 2.24.1 -From 441a3383dab6b081eddd5a46f41d938d0f5aa8d3 Mon Sep 17 00:00:00 2001 +From eeae7fd7e057e6de5cfb78fd01f960721a0c2259 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 @@ -2761,10 +2761,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 2956aa8c3f6d..a91669d7a5e0 100644 +index 65461a57074c..b323308611f4 100644 --- a/po/eo.po +++ b/po/eo.po -@@ -2663,8 +2663,8 @@ msgstr "_Fermi la fenestron" +@@ -2811,8 +2811,8 @@ msgstr "_Fermi la fenestron" #~ msgid "_Font:" #~ msgstr "_Tiparo:" @@ -2775,7 +2775,7 @@ index 2956aa8c3f6d..a91669d7a5e0 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Ŝalti al langeto 3" -@@ -2726,8 +2726,8 @@ msgstr "_Fermi la fenestron" +@@ -2874,8 +2874,8 @@ msgstr "_Fermi la fenestron" #~ msgid "_Input Methods" #~ msgstr "_Enigmetodoj" @@ -2920,7 +2920,7 @@ index 056943256725..bbb7ade1bb6b 100644 +msgid "Set Title" +msgstr "Aseta otsikko" diff --git a/po/fr.po b/po/fr.po -index f24e886dc948..5a9f9b5cde5c 100644 +index bb0f3b03db93..1e384d03c6db 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2485,3 +2485,15 @@ msgstr "Fermer _la fenêtre" @@ -3055,10 +3055,10 @@ index 76b459cf8dc5..485beeac98b7 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" diff --git a/po/he.po b/po/he.po -index 57cb2d0d110f..efe8fa100074 100644 +index 167d2b659b83..845b38be855e 100644 --- a/po/he.po +++ b/po/he.po -@@ -2333,17 +2333,17 @@ msgstr "סגירת ה_חלון" +@@ -2882,17 +2882,17 @@ msgstr "סגירת ה_חלון" #~ msgid "Default size:" #~ msgstr "גודל בררת מחדל:" @@ -3082,7 +3082,7 @@ index 57cb2d0d110f..efe8fa100074 100644 #~ msgid "Current Locale" #~ msgstr "השפה הנוכחית" -@@ -3194,8 +3194,8 @@ msgstr "סגירת ה_חלון" +@@ -3704,8 +3704,8 @@ msgstr "סגירת ה_חלון" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -3247,10 +3247,10 @@ index e08dfae8009c..b224bbdc1f3a 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index 69608253837f..87d927431d7a 100644 +index 557d85dbd201..c89c4e533d3f 100644 --- a/po/ja.po +++ b/po/ja.po -@@ -2481,3 +2481,15 @@ msgstr "ウィンドウを閉じる(_L)" +@@ -2484,3 +2484,15 @@ msgstr "ウィンドウを閉じる(_L)" #~ msgid "_Incremental Search…" #~ msgstr "インクリメンタル検索(_I)…" @@ -3971,10 +3971,10 @@ index d5f10e4f2cbd..cd2f908fb579 100644 +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index e76d6df41aae..49fd8401e70d 100644 +index c6b971edd35a..ff9162de3d01 100644 --- a/po/ro.po +++ b/po/ro.po -@@ -3484,8 +3484,8 @@ msgstr "Î_nchide fereastra" +@@ -3485,8 +3485,8 @@ msgstr "Î_nchide fereastra" #~ msgid "_Solid color" #~ msgstr "Culoare _solidă" @@ -4077,10 +4077,10 @@ index 06ffff4ee055..ab62c01f8f85 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index 2335257b8cf4..417872b90c2c 100644 +index 0123d280c9b3..529f0452bcd0 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2699,17 +2699,17 @@ msgstr "_Zapri okno" +@@ -2809,17 +2809,17 @@ msgstr "_Zapri okno" #~ msgid "Default size:" #~ msgstr "Privzeta velikost:" @@ -4104,7 +4104,7 @@ index 2335257b8cf4..417872b90c2c 100644 #~ msgid "Current Locale" #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2824,3 +2824,6 @@ msgstr "_Zapri okno" +@@ -2934,3 +2934,6 @@ msgstr "_Zapri okno" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -4762,7 +4762,7 @@ index 0ef3bb80be49..5c162706fa7b 100644 2.24.1 -From 17af27d64f5a742d8ea5e92943e75d0bbd02146e Mon Sep 17 00:00:00 2001 +From 0cca135c93c2987c6d73dd72fb120bc0456eed01 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 @@ -4910,7 +4910,7 @@ index c0219d872725..61c5e7de350a 100644 2.24.1 -From 336539b56a4170708430335493d1f4e3fa9cca2d Mon Sep 17 00:00:00 2001 +From ebd04f8228b970bab8243cc834a8ef72b3623f76 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 +4924,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 63cc33a2b29c..d0e0d55d04a9 100644 +index e0de69ccdcc2..34893704a607 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -833,7 +833,7 @@ terminal_screen_new (GSettings *profile, +@@ -837,7 +837,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ @@ -4940,7 +4940,7 @@ index 63cc33a2b29c..d0e0d55d04a9 100644 2.24.1 -From d2dee809878101cf499ad9b7bfe55e94ef842a75 Mon Sep 17 00:00:00 2001 +From 396944ed8cd28599e879d8aa7dc763711a2a1276 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 @@ -5094,10 +5094,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 d0e0d55d04a9..d41c6da1070d 100644 +index 34893704a607..a5f4d653b524 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -113,8 +113,11 @@ struct _TerminalScreenPrivate +@@ -114,8 +114,11 @@ struct _TerminalScreenPrivate ExecData *exec_data; gboolean between_preexec_and_precmd; @@ -5110,7 +5110,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -131,8 +134,7 @@ enum +@@ -132,8 +135,7 @@ enum enum { PROP_0, PROP_PROFILE, @@ -5120,7 +5120,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 }; enum -@@ -182,8 +184,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal +@@ -183,8 +185,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal static void update_color_scheme (TerminalScreen *screen); @@ -5134,7 +5134,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 static void terminal_screen_check_extra (TerminalScreen *screen, GdkEvent *event, char **number_info); -@@ -561,6 +568,9 @@ terminal_screen_init (TerminalScreen *screen) +@@ -565,6 +572,9 @@ terminal_screen_init (TerminalScreen *screen) gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); @@ -5144,7 +5144,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 g_signal_connect (screen, "window-title-changed", G_CALLBACK (terminal_screen_window_title_changed), screen); -@@ -594,9 +604,6 @@ terminal_screen_get_property (GObject *object, +@@ -598,9 +608,6 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -5154,7 +5154,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -617,7 +624,6 @@ terminal_screen_set_property (GObject *object, +@@ -621,7 +628,6 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, g_value_get_object (value)); break; case PROP_TITLE: @@ -5162,7 +5162,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -707,13 +713,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -711,13 +717,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 +5176,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -810,7 +809,9 @@ terminal_screen_finalize (GObject *object) +@@ -814,7 +813,9 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -5187,7 +5187,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -830,28 +831,8 @@ terminal_screen_new (GSettings *profile, +@@ -834,28 +835,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 +5218,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom); terminal_screen_set_font (screen); -@@ -1047,28 +1028,139 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -1053,28 +1034,139 @@ terminal_screen_exec (TerminalScreen *screen, return TRUE; } @@ -5369,7 +5369,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 } static void -@@ -1111,9 +1203,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1117,9 +1209,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5381,7 +5381,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1401,7 +1494,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1407,7 +1500,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5389,7 +5389,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 } GSettings* -@@ -1746,8 +1838,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1752,8 +1844,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5398,7 +5398,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, NULL); -@@ -2023,33 +2113,45 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -2029,33 +2119,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5458,7 +5458,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 } /** -@@ -2082,7 +2184,9 @@ static void +@@ -2088,7 +2190,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5469,7 +5469,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 } static void -@@ -2105,8 +2209,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2111,8 +2215,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -5478,7 +5478,7 @@ index d0e0d55d04a9..d41c6da1070d 100644 action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); switch (action) -@@ -2150,6 +2252,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2156,6 +2258,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5557,7 +5557,7 @@ index 61c5e7de350a..0d61db3c125d 100644 2.24.1 -From b7ab781c8334f4aa0c855277ff8ede80195a87a6 Mon Sep 17 00:00:00 2001 +From 514d426d0aa0362d170e8470e68bee991fc63858 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 @@ -5600,10 +5600,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 d41c6da1070d..2857de003753 100644 +index a5f4d653b524..21bbac0dacf9 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -112,7 +112,9 @@ struct _TerminalScreenPrivate +@@ -113,7 +113,9 @@ struct _TerminalScreenPrivate guint idle_exec_source; ExecData *exec_data; @@ -5613,7 +5613,7 @@ index d41c6da1070d..2857de003753 100644 gboolean user_title; /* title was manually set */ char *current_cmdline; char *raw_title; -@@ -1143,6 +1145,20 @@ terminal_screen_format_title (TerminalScreen *screen, +@@ -1149,6 +1151,20 @@ terminal_screen_format_title (TerminalScreen *screen, add_sep = FALSE; } @@ -5634,7 +5634,7 @@ index d41c6da1070d..2857de003753 100644 if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) { g_free (*titleptr); -@@ -1172,6 +1188,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1178,6 +1194,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, GObject *object = G_OBJECT (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen); TerminalWindow *window; @@ -5642,7 +5642,7 @@ index d41c6da1070d..2857de003753 100644 g_object_freeze_notify (object); -@@ -1206,7 +1223,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1212,7 +1229,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 +5651,7 @@ index d41c6da1070d..2857de003753 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1234,6 +1251,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1240,6 +1257,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) update_color_scheme (screen); @@ -5665,7 +5665,7 @@ index d41c6da1070d..2857de003753 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)); -@@ -1294,6 +1318,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1300,6 +1324,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); } @@ -5675,7 +5675,7 @@ index d41c6da1070d..2857de003753 100644 g_object_thaw_notify (object); } -@@ -2184,6 +2211,9 @@ static void +@@ -2190,6 +2217,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5685,7 +5685,7 @@ index d41c6da1070d..2857de003753 100644 terminal_screen_set_dynamic_title (screen, vte_terminal_get_window_title (vte_terminal), FALSE); -@@ -2290,6 +2320,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) +@@ -2296,6 +2326,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 +5694,7 @@ index d41c6da1070d..2857de003753 100644 out: priv->contents_changed_source_id = 0; return G_SOURCE_REMOVE; -@@ -2382,6 +2414,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2388,6 +2420,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); @@ -5702,7 +5702,7 @@ index d41c6da1070d..2857de003753 100644 priv->between_preexec_and_precmd = FALSE; if (priv->contents_changed_source_id != 0) -@@ -2401,6 +2434,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2407,6 +2440,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 +5711,7 @@ index d41c6da1070d..2857de003753 100644 } static gboolean -@@ -2421,6 +2456,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) +@@ -2427,6 +2462,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); @@ -5724,7 +5724,7 @@ index d41c6da1070d..2857de003753 100644 2.24.1 -From 5a93d207f36fa2c115a98d97c11ec49a2512f3a4 Mon Sep 17 00:00:00 2001 +From f92b1bda7ecde7a3a8f9a53345d44b5a7ecf8c2f 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 +5734,16 @@ advertises the name of the current toolbox container. https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 --- - src/terminal-screen.c | 37 ++++++++++++++++++++++++++++++++++--- + src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- src/terminal-screen.h | 6 ++++++ src/terminal-window.c | 26 ++++++++++++++++++++++++-- - 3 files changed, 64 insertions(+), 5 deletions(-) + 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 2857de003753..6ffcfe575754 100644 +index 21bbac0dacf9..aadc67fc1d47 100644 --- a/src/terminal-screen.c +++ b/src/terminal-screen.c -@@ -877,6 +877,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -881,6 +881,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, TerminalScreen *parent_screen, GCancellable *cancellable, GError **error) @@ -5769,15 +5769,12 @@ index 2857de003753..6ffcfe575754 100644 { g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); -@@ -887,15 +906,27 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, - +@@ -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); 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); + @@ -5791,15 +5788,6 @@ index 2857de003753..6ffcfe575754 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 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index d463057..d680874 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,8 +7,8 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.36.1.1 -Release: 4%{?dist} +Version: 3.36.2 +Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ @@ -107,6 +107,10 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Fri Sep 25 2020 Debarshi Ray - 3.36.2-1 +- Update to 3.36.2 +- Rebase the patches + * Sat Aug 01 2020 Fedora Release Engineering - 3.36.1.1-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index edce4ac..1a88707 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.36.1.1.tar.xz) = 86d5e050a0e5dff44864aaa9acc98f95203d9d55195c2ff4864aa98eaad77abd6b31e0e36d6cb15d383cddff84c22996a9b21d87be68551b3add50d7010c4129 +SHA512 (gnome-terminal-3.36.2.tar.xz) = 0d691452456dd495b812332f206b6f8a590f67d47a6afce582b2ff0587747c36cb1eaf249080c6a3c3540ef22a50628801165d6c17eeb1b821eea1e244f79a91