From 543c2d91c1f459258a72a7bcf86828d443aac156 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 23 Jan 2023 14:59:45 +0000 Subject: [PATCH] Update to 3.46.7 (#2155523) --- .gitignore | 1 + gnome-terminal-cntr-ntfy-autottl-ts.patch | 727 ++++++++++++---------- gnome-terminal.spec | 15 +- sources | 2 +- 4 files changed, 395 insertions(+), 350 deletions(-) diff --git a/.gitignore b/.gitignore index 8e4bc3f..b405b8f 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.43.90.tar.xz /gnome-terminal-3.44.0.tar.xz /gnome-terminal-3.44.1.tar.xz +/gnome-terminal-3.46.7.tar.bz2 diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index c0fa9f3..d95686e 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,4 +1,4 @@ -From f5773d45951d62ccc8d8476862779f8f6d3a4ae3 Mon Sep 17 00:00:00 2001 +From b258ef0bdc4f1ea8dc9d8bf0b47a14d0b17d4473 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,7 +25,7 @@ Some changes by Peter Weber 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 26b96acf..b6c42ec6 100644 +index a860b73c..cca1aef3 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -349,6 +349,16 @@ @@ -46,7 +46,7 @@ index 26b96acf..b6c42ec6 100644 diff --git a/src/preferences.ui b/src/preferences.ui -index d1aca7b2..64f8295b 100644 +index ca58c656..f3979307 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -95,6 +95,11 @@ @@ -61,7 +61,7 @@ index d1aca7b2..64f8295b 100644 -@@ -1402,6 +1407,48 @@ +@@ -1435,6 +1440,48 @@ 1 @@ -141,7 +141,7 @@ index 0cb99b62..d0e71e26 100644 /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh -index b146ba82..d2917fac 100644 +index 61f1305e..c33723bf 100644 --- a/src/terminal-schemas.hh +++ b/src/terminal-schemas.hh @@ -78,6 +78,9 @@ G_BEGIN_DECLS @@ -155,10 +155,10 @@ index b146ba82..d2917fac 100644 #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 505ad46d..22caa815 100644 +index 54e10223..bae9c0cf 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -1055,7 +1055,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1059,7 +1059,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) || @@ -169,7 +169,7 @@ index 505ad46d..22caa815 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1140,6 +1142,8 @@ update_color_scheme (TerminalScreen *screen) +@@ -1144,6 +1146,8 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; @@ -178,7 +178,7 @@ index 505ad46d..22caa815 100644 gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -1183,6 +1187,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -1187,6 +1191,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -197,7 +197,7 @@ index 505ad46d..22caa815 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1190,6 +1206,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -1194,6 +1210,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); @@ -209,10 +209,10 @@ index 505ad46d..22caa815 100644 static void diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index 76f18000..d739f693 100644 +index 36eb7ce7..a41d2de2 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -2133,6 +2133,8 @@ terminal_window_init (TerminalWindow *window) +@@ -2173,6 +2173,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -221,7 +221,7 @@ index 76f18000..d739f693 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2148,6 +2150,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2188,6 +2190,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); @@ -234,10 +234,10 @@ index 76f18000..d739f693 100644 uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.37.1 +2.39.1 -From d4bc7178c38ef4f23749aceb3a19f725f38ede2e Mon Sep 17 00:00:00 2001 +From 0ab778ac032b1b5bc938dc73b11c2b58271b8567 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 @@ -257,10 +257,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=730016 1 file changed, 21 insertions(+) diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index d739f693..04d977ed 100644 +index a41d2de2..11d93419 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -1963,6 +1963,26 @@ terminal_window_realize (GtkWidget *widget) +@@ -2003,6 +2003,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } @@ -287,7 +287,7 @@ index d739f693..04d977ed 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2303,6 +2323,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2368,6 +2388,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -296,10 +296,10 @@ index d739f693..04d977ed 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.37.1 +2.39.1 -From 64780a82bfaabd8207e9f38dfe705455e3e91ce2 Mon Sep 17 00:00:00 2001 +From 893b1b1ffba63bcaa78a29a127b5787325abc8cb 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 @@ -312,10 +312,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1207943 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 22caa815..29c4dcd0 100644 +index bae9c0cf..85f0fbcf 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -152,6 +152,8 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -156,6 +156,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); @@ -324,7 +324,7 @@ index 22caa815..29c4dcd0 100644 static void terminal_screen_child_exited (VteTerminal *terminal, int status); -@@ -595,6 +597,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -599,6 +601,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; @@ -332,7 +332,7 @@ index 22caa815..29c4dcd0 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -1127,6 +1130,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1131,6 +1134,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -365,7 +365,7 @@ index 22caa815..29c4dcd0 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -1142,7 +1171,6 @@ update_color_scheme (TerminalScreen *screen) +@@ -1146,7 +1175,6 @@ update_color_scheme (TerminalScreen *screen) GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; @@ -373,7 +373,7 @@ index 22caa815..29c4dcd0 100644 gboolean transparent; gboolean use_theme_colors; -@@ -1207,9 +1235,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -1211,9 +1239,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); @@ -384,7 +384,7 @@ index 22caa815..29c4dcd0 100644 } static void -@@ -1747,6 +1773,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1752,6 +1778,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -399,10 +399,10 @@ index 22caa815..29c4dcd0 100644 terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index 04d977ed..be8533e6 100644 +index 11d93419..61857bfe 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -1969,15 +1969,21 @@ terminal_window_draw (GtkWidget *widget, +@@ -2009,15 +2009,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -431,10 +431,10 @@ index 04d977ed..be8533e6 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.37.1 +2.39.1 -From e1347af9d631a9a5685d2975b84ce7d11d1d3ec0 Mon Sep 17 00:00:00 2001 +From 65f3ece2a95a9ec950d7be7b63cd1a5acc2731b7 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 @@ -460,10 +460,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 29c4dcd0..94911868 100644 +index 85f0fbcf..a973aa87 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -2338,7 +2338,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2343,7 +2343,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, nullptr)) @@ -501,10 +501,10 @@ index 29c4dcd0..94911868 100644 #endif -- -2.37.1 +2.39.1 -From c0029d743f65ecfad651a5828ec19ab8d0a57d1f Mon Sep 17 00:00:00 2001 +From a80239410e4baf22ee57857d77ec469cbd2921dd 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 @@ -521,41 +521,39 @@ process. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- src/terminal-debug.cc | 1 + - src/terminal-debug.hh | 3 +- + src/terminal-debug.hh | 1 + src/terminal-screen.cc | 150 +++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 153 insertions(+), 1 deletion(-) + 3 files changed, 152 insertions(+) diff --git a/src/terminal-debug.cc b/src/terminal-debug.cc -index 52acc70c..6324cbce 100644 +index bf2db7e9..e2645335 100644 --- a/src/terminal-debug.cc +++ b/src/terminal-debug.cc -@@ -38,6 +38,7 @@ _terminal_debug_init(void) - { "profile", TERMINAL_DEBUG_PROFILE }, - { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST }, +@@ -40,6 +40,7 @@ _terminal_debug_init(void) { "search", TERMINAL_DEBUG_SEARCH }, + { "bridge", TERMINAL_DEBUG_BRIDGE }, + { "default", TERMINAL_DEBUG_DEFAULT }, + { "shell-command", TERMINAL_DEBUG_SHELL_COMMAND }, }; _terminal_debug_flags = TerminalDebugFlags(g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), diff --git a/src/terminal-debug.hh b/src/terminal-debug.hh -index 0fafcc3a..b0f2fc9d 100644 +index fedc9e4d..94f0e30b 100644 --- a/src/terminal-debug.hh +++ b/src/terminal-debug.hh -@@ -34,7 +34,8 @@ typedef enum { - TERMINAL_DEBUG_PROCESSES = 1 << 6, - TERMINAL_DEBUG_PROFILE = 1 << 7, - TERMINAL_DEBUG_SETTINGS_LIST = 1 << 8, -- TERMINAL_DEBUG_SEARCH = 1 << 9 -+ TERMINAL_DEBUG_SEARCH = 1 << 9, -+ TERMINAL_DEBUG_SHELL_COMMAND = 1 << 10, +@@ -37,6 +37,7 @@ typedef enum { + TERMINAL_DEBUG_SEARCH = 1 << 9, + TERMINAL_DEBUG_BRIDGE = 1 << 10, + TERMINAL_DEBUG_DEFAULT = 1 << 11, ++ TERMINAL_DEBUG_SHELL_COMMAND = 1 << 12, } TerminalDebugFlags; void _terminal_debug_init(void); diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 94911868..3048d56d 100644 +index a973aa87..e5400940 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -108,6 +108,11 @@ struct _TerminalScreenPrivate +@@ -112,6 +112,11 @@ struct _TerminalScreenPrivate gboolean exec_on_realize; guint idle_exec_source; ExecData *exec_data; @@ -567,7 +565,7 @@ index 94911868..3048d56d 100644 }; enum -@@ -157,6 +162,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, +@@ -161,6 +166,12 @@ static void terminal_screen_hierarchy_changed (GtkWidget *widget, static void terminal_screen_child_exited (VteTerminal *terminal, int status); @@ -580,7 +578,7 @@ index 94911868..3048d56d 100644 static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen); -@@ -600,6 +611,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -604,6 +615,9 @@ terminal_screen_class_init (TerminalScreenClass *klass) widget_class->hierarchy_changed = terminal_screen_hierarchy_changed; terminal_class->child_exited = terminal_screen_child_exited; @@ -590,7 +588,7 @@ index 94911868..3048d56d 100644 signals[PROFILE_SET] = g_signal_new (I_("profile-set"), -@@ -705,6 +719,18 @@ terminal_screen_dispose (GObject *object) +@@ -709,6 +723,18 @@ terminal_screen_dispose (GObject *object) 0, 0, nullptr, nullptr, screen); @@ -609,7 +607,7 @@ index 94911868..3048d56d 100644 if (priv->idle_exec_source != 0) { g_source_remove (priv->idle_exec_source); -@@ -741,6 +767,7 @@ terminal_screen_finalize (GObject *object) +@@ -745,6 +771,7 @@ terminal_screen_finalize (GObject *object) g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data); g_free (priv->uuid); @@ -617,7 +615,7 @@ index 94911868..3048d56d 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1961,6 +1988,125 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1966,6 +1993,125 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -743,7 +741,7 @@ index 94911868..3048d56d 100644 static void terminal_screen_drag_data_received (GtkWidget *widget, GdkDragContext *context, -@@ -2307,7 +2453,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2312,7 +2458,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, if (fd == -1) return FALSE; @@ -756,10 +754,10 @@ index 94911868..3048d56d 100644 return FALSE; -- -2.37.1 +2.39.1 -From 45771ee807e8ca920d88f084dd9eefd1099193d8 Mon Sep 17 00:00:00 2001 +From 5de49ccd79b557223f0cbbfb8254ec9319502f18 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 @@ -780,10 +778,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711059 4 files changed, 174 insertions(+), 1 deletion(-) diff --git a/src/terminal-app.cc b/src/terminal-app.cc -index a06485cf..3eae3b29 100644 +index 70933a68..1f90a66b 100644 --- a/src/terminal-app.cc +++ b/src/terminal-app.cc -@@ -742,6 +742,31 @@ app_menu_quit_cb (GSimpleAction *action, +@@ -848,6 +848,31 @@ app_menu_quit_cb (GSimpleAction *action, gtk_widget_destroy (GTK_WIDGET (window)); } @@ -812,21 +810,17 @@ index a06485cf..3eae3b29 100644 + gtk_window_present (GTK_WINDOW (toplevel)); +} + - /* Class implementation */ + #endif /* TERMINAL_SERVER */ - G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -765,6 +790,10 @@ terminal_app_startup (GApplication *application) + /* Class implementation */ +@@ -890,9 +915,16 @@ terminal_app_startup (GApplication *application) { "quit", app_menu_quit_cb, nullptr, nullptr, nullptr } }; -+ const GActionEntry other_actions[] = { -+ { "activate-tab", action_activate_tab_cb, "s", nullptr, nullptr } ++ GActionEntry const other_actions[] = { ++ { "activate-tab", action_activate_tab_cb, "s", nullptr, nullptr } + }; + - g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX); - - G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application); -@@ -775,6 +804,9 @@ terminal_app_startup (GApplication *application) g_action_map_add_action_entries (G_ACTION_MAP (application), action_entries, G_N_ELEMENTS (action_entries), application); @@ -834,10 +828,10 @@ index a06485cf..3eae3b29 100644 + other_actions, G_N_ELEMENTS (other_actions), + application); - app_load_css (application); - + /* Figure out whether the shell shows the menubar */ + gboolean shell_shows_menubar; diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 3048d56d..21d71275 100644 +index e5400940..219c051a 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc @@ -55,6 +55,7 @@ @@ -848,7 +842,7 @@ index 3048d56d..21d71275 100644 #include "terminal-util.hh" #include "terminal-window.hh" #include "terminal-info-bar.hh" -@@ -157,6 +158,10 @@ static void terminal_screen_system_font_changed_cb (GSettings *, +@@ -161,6 +162,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); @@ -859,7 +853,7 @@ index 3048d56d..21d71275 100644 static void terminal_screen_hierarchy_changed (GtkWidget *widget, GtkWidget *previous_toplevel); static void terminal_screen_child_exited (VteTerminal *terminal, -@@ -603,6 +608,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -607,6 +612,7 @@ terminal_screen_class_init (TerminalScreenClass *klass) object_class->get_property = terminal_screen_get_property; object_class->set_property = terminal_screen_set_property; @@ -867,7 +861,7 @@ index 3048d56d..21d71275 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; -@@ -708,6 +714,10 @@ terminal_screen_dispose (GObject *object) +@@ -712,6 +718,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -878,7 +872,7 @@ index 3048d56d..21d71275 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1892,6 +1902,45 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1897,6 +1907,45 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -924,7 +918,7 @@ index 3048d56d..21d71275 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2037,6 +2086,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) +@@ -2042,6 +2091,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) screen); } @@ -988,7 +982,7 @@ index 3048d56d..21d71275 100644 static void terminal_screen_shell_precmd (VteTerminal *terminal) { -@@ -2059,6 +2165,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2064,6 +2170,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) priv->shell_preexec_source_id = 0; } @@ -1076,10 +1070,10 @@ index 91b7e617..37e808a7 100644 G_END_DECLS -- -2.37.1 +2.39.1 -From cdb622da32321eea96b17a3d602dbb93f16ca9f2 Mon Sep 17 00:00:00 2001 +From f17dfaef169d3563ff62f4e0e41483c316040982 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 @@ -1093,10 +1087,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 64f8295b..426993a4 100644 +index f3979307..285a3c61 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1965,130 +1965,137 @@ +@@ -1998,130 +1998,137 @@ True False 12 @@ -1351,10 +1345,10 @@ index 64f8295b..426993a4 100644 -- -2.37.1 +2.39.1 -From db1b6910b1c01e1dcc79829a98cee63ed9ee1aad Mon Sep 17 00:00:00 2001 +From 020367f3110a0c8fe513b562aae43aea98a1264e 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" @@ -1367,10 +1361,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 426993a4..7f4a94c8 100644 +index 285a3c61..5422de71 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1973,129 +1973,168 @@ +@@ -2006,129 +2006,168 @@ 12 6 @@ -1644,10 +1638,10 @@ index 426993a4..7f4a94c8 100644 -- -2.37.1 +2.39.1 -From 5c282d45a733a16d1c827d7aa5b43e2041f8fb73 Mon Sep 17 00:00:00 2001 +From 052881d7c856ecfd4397ffd26db064b83cc1d9ac 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 @@ -1662,10 +1656,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 2 files changed, 69 insertions(+) diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 21d71275..4161debe 100644 +index 219c051a..f22bcf65 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -112,6 +112,7 @@ struct _TerminalScreenPrivate +@@ -116,6 +116,7 @@ struct _TerminalScreenPrivate gboolean between_preexec_and_precmd; char *current_cmdline; @@ -1673,7 +1667,7 @@ index 21d71275..4161debe 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -129,6 +130,7 @@ enum { +@@ -133,6 +134,7 @@ enum { PROP_0, PROP_PROFILE, PROP_TITLE, @@ -1681,7 +1675,7 @@ index 21d71275..4161debe 100644 }; enum -@@ -567,6 +569,9 @@ terminal_screen_get_property (GObject *object, +@@ -571,6 +573,9 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -1691,7 +1685,7 @@ index 21d71275..4161debe 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -587,6 +592,7 @@ terminal_screen_set_property (GObject *object, +@@ -591,6 +596,7 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: @@ -1699,7 +1693,7 @@ index 21d71275..4161debe 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -682,6 +688,14 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -686,6 +692,14 @@ terminal_screen_class_init (TerminalScreenClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))); @@ -1714,7 +1708,7 @@ index 21d71275..4161debe 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -778,6 +792,7 @@ terminal_screen_finalize (GObject *object) +@@ -782,6 +796,7 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -1722,7 +1716,7 @@ index 21d71275..4161debe 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1036,6 +1051,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -1040,6 +1055,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1744,7 +1738,7 @@ index 21d71275..4161debe 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1364,6 +1394,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1368,6 +1398,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1752,7 +1746,7 @@ index 21d71275..4161debe 100644 } GSettings* -@@ -1650,6 +1681,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1655,6 +1686,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1761,7 +1755,7 @@ index 21d71275..4161debe 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, nullptr); -@@ -1941,6 +1974,35 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1946,6 +1979,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1797,7 +1791,7 @@ index 21d71275..4161debe 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1994,6 +2056,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1999,6 +2061,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -1824,10 +1818,10 @@ index ded6b8ca..f4ec9047 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.37.1 +2.39.1 -From 051746935290a1a0985b233b68072397761624bc Mon Sep 17 00:00:00 2001 +From b51278e3fefc940b75e2b7581638f93efcf9f32b 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 @@ -1845,7 +1839,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 5 files changed, 92 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index b6c42ec6..3ef53b8b 100644 +index cca1aef3..9a41c45f 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -209,6 +209,11 @@ @@ -1861,10 +1855,10 @@ index b6c42ec6..3ef53b8b 100644 false Whether bold is also bright diff --git a/src/preferences.ui b/src/preferences.ui -index 7f4a94c8..f86f8c98 100644 +index 5422de71..d851bcb6 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -1966,6 +1966,77 @@ +@@ -1999,6 +1999,77 @@ False 12 18 @@ -1960,7 +1954,7 @@ index d0e71e26..f7997fbf 100644 gtk_builder_get_object (builder, "use-custom-command-checkbutton"), diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh -index d2917fac..16e5c326 100644 +index c33723bf..d0f111a0 100644 --- a/src/terminal-schemas.hh +++ b/src/terminal-schemas.hh @@ -71,6 +71,7 @@ G_BEGIN_DECLS @@ -1972,10 +1966,10 @@ index d2917fac..16e5c326 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.cc b/src/terminal-screen.cc -index 4161debe..df36d254 100644 +index f22bcf65..8949d135 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -1055,11 +1055,14 @@ char * +@@ -1059,11 +1059,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; @@ -1990,7 +1984,7 @@ index 4161debe..df36d254 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -1105,6 +1108,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1109,6 +1112,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_cjk_ambiguous_width (vte_terminal, width); } @@ -2004,109 +1998,109 @@ index 4161debe..df36d254 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.37.1 +2.39.1 -From 1aabe8a7030d34486794f0871c361d657ceb0057 Mon Sep 17 00:00:00 2001 +From 06df6eeaf16709f235d9eeb49a1be9ed606aa3f7 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 transparency --- - po/am.po | 8 ++++---- - po/an.po | 12 ++++++------ - po/ar.po | 16 ++++++++-------- - po/as.po | 16 ++++++++-------- - po/ast.po | 8 ++++---- - po/az.po | 8 ++++---- - po/be.po | 3 +++ - po/be@latin.po | 8 ++++---- - po/bg.po | 9 +++++++++ - po/bn.po | 8 ++++---- - po/bn_IN.po | 11 +++++++---- - po/br.po | 6 +++--- - po/bs.po | 10 ++++++++++ - po/ca.po | 12 ++++++++++++ - po/ca@valencia.po | 12 ++++++++++++ - po/cs.po | 12 ++++++++++++ - po/cy.po | 8 ++++---- - po/da.po | 12 ++++++++++++ - po/de.po | 12 ++++++++++++ - po/dz.po | 8 ++++---- - po/el.po | 15 +++++++++------ - po/en@shaw.po | 8 ++++---- - po/en_CA.po | 8 ++++---- - po/en_GB.po | 16 ++++++++-------- - po/eo.po | 8 ++++---- - po/es.po | 16 ++++++++-------- - po/et.po | 3 +++ - po/eu.po | 12 ++++++++++++ - po/fa.po | 15 +++++++++------ - po/fi.po | 12 ++++++++++++ - po/fr.po | 24 ++++++++++++++++++++++++ - po/fur.po | 11 +++++++++-- - po/ga.po | 3 +++ - po/gl.po | 12 ++++++++++++ - po/gu.po | 16 ++++++++-------- - po/he.po | 16 ++++++++-------- - po/hi.po | 17 ++++++++--------- - po/hr.po | 10 ++++++++++ - po/hu.po | 12 ++++++++++++ - po/hy.po | 8 ++++---- - po/id.po | 12 ++++++++++++ - po/it.po | 12 ++++++++++++ - po/ja.po | 12 ++++++++++++ - po/ka.po | 5 +++++ - po/kk.po | 12 ++++++++++++ - po/km.po | 4 ++-- - po/kn.po | 15 +++++++++------ - po/ko.po | 12 ++++++++++++ - po/ku.po | 8 ++++---- - po/lt.po | 12 ++++++++++++ - po/lv.po | 16 ++++++++++++++++ - po/mai.po | 8 ++++---- - po/mg.po | 8 ++++---- - po/mk.po | 8 ++++---- - po/ml.po | 3 +++ - po/mn.po | 8 ++++---- - po/mr.po | 16 ++++++++-------- - po/ms.po | 4 ++-- - po/nb.po | 12 ++++++++++++ - po/nds.po | 8 ++++---- - po/ne.po | 11 +++++++---- - po/nl.po | 12 ++++++++++++ - po/nn.po | 8 ++++---- - po/oc.po | 12 ++++++------ - po/or.po | 4 ++-- - po/pa.po | 23 +++++++++++------------ - po/ps.po | 8 ++++---- - po/pt.po | 16 ++++++++-------- - po/pt_BR.po | 12 ++++++++++++ - po/ro.po | 4 ++-- - po/ru.po | 16 ++++++++++++++++ - po/rw.po | 3 +-- - po/si.po | 8 ++++---- - po/sk.po | 12 ++++++++++++ - po/sl.po | 15 +++++++++------ - po/sq.po | 8 ++++---- - po/sr.po | 22 ++++++++++++---------- - po/sr@latin.po | 22 ++++++++++++---------- - po/sv.po | 12 ++++++++++++ - po/ta.po | 27 +++++++++++++-------------- - po/te.po | 27 +++++++++++++-------------- - po/tg.po | 16 ++++++++-------- - po/th.po | 20 ++++++++++---------- - po/tr.po | 12 ++++++++++++ - po/ug.po | 4 ++-- - po/uk.po | 15 +++++++++++++++ - po/vi.po | 15 +++++++++------ - po/wa.po | 12 ++++++------ - po/xh.po | 12 ++++++------ - po/zh_CN.po | 15 +++++++++------ - po/zh_HK.po | 15 +++++++++------ - po/zh_TW.po | 15 +++++++++------ - 92 files changed, 737 insertions(+), 332 deletions(-) + po/am.po | 8 +++--- + po/an.po | 12 ++++---- + po/ar.po | 16 +++++------ + po/as.po | 16 +++++------ + po/ast.po | 8 +++--- + po/az.po | 8 +++--- + po/be.po | 3 ++ + po/be@latin.po | 8 +++--- + po/bg.po | 9 ++++++ + po/bn.po | 8 +++--- + po/bn_IN.po | 11 +++++--- + po/br.po | 6 ++-- + po/bs.po | 10 +++++++ + po/ca.po | 11 ++++++++ + po/ca@valencia.po | 12 ++++++++ + po/cs.po | 12 ++++++++ + po/cy.po | 8 +++--- + po/da.po | 12 ++++++++ + po/de.po | 12 ++++++++ + po/dz.po | 8 +++--- + po/el.po | 15 ++++++---- + po/en@shaw.po | 8 +++--- + po/en_CA.po | 8 +++--- + po/en_GB.po | 16 +++++------ + po/eo.po | 8 +++--- + po/es.po | 16 +++++------ + po/et.po | 3 ++ + po/eu.po | 12 ++++++++ + po/fa.po | 15 ++++++---- + po/fi.po | 12 ++++++++ + po/fr.po | 24 ++++++++++++++++ + po/fur.po | 11 ++++++-- + po/ga.po | 3 ++ + po/gl.po | 12 ++++++++ + po/gu.po | 16 +++++------ + po/he.po | 16 +++++------ + po/hi.po | 17 ++++++------ + po/hr.po | 10 +++++++ + po/hu.po | 12 ++++++++ + po/hy.po | 8 +++--- + po/id.po | 12 ++++++++ + po/it.po | 12 ++++++++ + po/ja.po | 12 ++++++++ + po/ka.po | 5 ++++ + po/kk.po | 12 ++++++++ + po/km.po | 4 +-- + po/kn.po | 15 ++++++---- + po/ko.po | 12 ++++++++ + po/ku.po | 8 +++--- + po/lt.po | 12 ++++++++ + po/lv.po | 16 +++++++++++ + po/mai.po | 8 +++--- + po/mg.po | 8 +++--- + po/mk.po | 8 +++--- + po/ml.po | 3 ++ + po/mn.po | 8 +++--- + po/mr.po | 16 +++++------ + po/ms.po | 4 +-- + po/nb.po | 12 ++++++++ + po/nds.po | 8 +++--- + po/ne.po | 11 +++++--- + po/nl.po | 12 ++++++++ + po/nn.po | 8 +++--- + po/oc.po | 12 ++++---- + po/or.po | 4 +-- + po/pa.po | 23 ++++++++-------- + po/ps.po | 8 +++--- + po/pt.po | 16 +++++------ + po/pt_BR.po | 12 ++++++++ + po/ro.po | 4 +-- + po/ru.po | 16 +++++++++++ + po/rw.po | 3 +- + po/si.po | 8 +++--- + po/sk.po | 12 ++++++++ + po/sl.po | 12 ++++++++ + po/sq.po | 8 +++--- + po/sr.po | 22 ++++++++------- + po/sr@latin.po | 22 ++++++++------- + po/sv.po | 12 ++++++++ + po/ta.po | 27 +++++++++--------- + po/te.po | 27 +++++++++--------- + po/tg.po | 16 +++++------ + po/th.po | 20 +++++++------- + po/tr.po | 12 ++++++++ + po/ug.po | 4 +-- + po/uk.po | 70 +++++++---------------------------------------- + po/vi.po | 15 ++++++---- + po/wa.po | 12 ++++---- + po/xh.po | 12 ++++---- + po/zh_CN.po | 15 ++++++---- + po/zh_HK.po | 15 ++++++---- + po/zh_TW.po | 15 ++++++---- + 92 files changed, 734 insertions(+), 386 deletions(-) diff --git a/po/am.po b/po/am.po index 3445d96d..ee992f07 100644 @@ -2463,14 +2457,13 @@ index 49e71085..87035529 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/ca.po b/po/ca.po -index 6cee9a84..a18941db 100644 +index 6db2cd03..4315b2fb 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2512,3 +2512,15 @@ msgstr "Ha fallat l'anàlisi dels arguments: %s\n" +@@ -2428,3 +2428,14 @@ msgstr "Tanca la _finestra" + msgid "Failed to parse arguments: %s\n" + msgstr "Ha fallat l'anàlisi dels arguments: %s\n" - #~ msgid "_Detach Tab" - #~ msgstr "_Separa la pestanya" -+ +msgid "Transparent background" +msgstr "Fons transparent" + @@ -2569,10 +2562,10 @@ index 8ca75914..a27a354f 100644 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" diff --git a/po/de.po b/po/de.po -index 8e6fa95a..98e7a8bc 100644 +index 4b88ee94..62067cd2 100644 --- a/po/de.po +++ b/po/de.po -@@ -2573,3 +2573,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n" +@@ -2578,3 +2578,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n" #~ msgid "_Quit" #~ msgstr "_Beenden" @@ -2826,10 +2819,10 @@ index 4b1c2a7c..77076116 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index 6e014314..16f485b4 100644 +index 56f3f1df..6d9680dc 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2362,3 +2362,15 @@ msgstr "Huts egin du argumentuak analizatzean: %s\n" +@@ -2366,3 +2366,15 @@ msgstr "Huts egin du argumentuak analizatzean: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Desuztartu fitxa" @@ -3056,10 +3049,10 @@ index 76b459cf..485beeac 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" જેવી કોઈ રૂપરેખા નથી, મૂળભૂત રૂપરેખા વાપરી રહ્યા છે\n" diff --git a/po/he.po b/po/he.po -index aeaf3993..54b763d4 100644 +index 5fbb458f..28c6e0cb 100644 --- a/po/he.po +++ b/po/he.po -@@ -2794,17 +2794,17 @@ msgstr "Failed to parse arguments: %s\n" +@@ -2797,17 +2797,17 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Default size:" #~ msgstr "גודל בררת מחדל:" @@ -3083,7 +3076,7 @@ index aeaf3993..54b763d4 100644 #~ msgid "Current Locale" #~ msgstr "השפה הנוכחית" -@@ -3616,8 +3616,8 @@ msgstr "Failed to parse arguments: %s\n" +@@ -3621,8 +3621,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -3144,10 +3137,10 @@ index 2d7dc5b1..8d3d0529 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" diff --git a/po/hr.po b/po/hr.po -index 92792203..9f4862ca 100644 +index 0c65eca2..1472cbb1 100644 --- a/po/hr.po +++ b/po/hr.po -@@ -2768,3 +2768,13 @@ msgstr "Greška u obradi argumenata: %s\n" +@@ -2763,3 +2763,13 @@ msgstr "Greška u obradi argumenata: %s\n" #~ msgid "Use transparency from system theme" #~ msgstr "Koristi prozirnost iz teme sustava" @@ -3162,10 +3155,10 @@ index 92792203..9f4862ca 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/hu.po b/po/hu.po -index 66793a82..1595a86b 100644 +index d34ab531..0ff0e9e0 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2463,3 +2463,15 @@ msgstr "_Ablak bezárása" +@@ -2403,3 +2403,15 @@ msgstr "_Ablak bezárása" #, c-format msgid "Failed to parse arguments: %s\n" msgstr "A paraméterek feldolgozása meghiúsult: %s\n" @@ -3208,10 +3201,10 @@ index aaf2d9b2..4d466f16 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/id.po b/po/id.po -index 868795ca..04459302 100644 +index 1f906ac1..4fd3f448 100644 --- a/po/id.po +++ b/po/id.po -@@ -2471,3 +2471,15 @@ msgstr "Gagal mengurai argumen: \"%s\"\n" +@@ -2474,3 +2474,15 @@ msgstr "Gagal mengurai argumen: \"%s\"\n" #~ msgid "_Detach Tab" #~ msgstr "_Pisahkan Tab" @@ -3228,10 +3221,10 @@ index 868795ca..04459302 100644 +msgid "Set Title" +msgstr "Atur Judul" diff --git a/po/it.po b/po/it.po -index afbebba8..afb09b0b 100644 +index c559a981..a69b00e5 100644 --- a/po/it.po +++ b/po/it.po -@@ -2485,3 +2485,15 @@ msgstr "Chiudi _finestra" +@@ -2428,3 +2428,15 @@ msgstr "Chiudi _finestra" #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Analisi degli argomenti non riuscita: %s\n" @@ -3268,10 +3261,10 @@ index ab72bc42..690281a6 100644 +msgid "Set Title" +msgstr "タイトルを設定する" diff --git a/po/ka.po b/po/ka.po -index c5855932..14356a48 100644 +index 601364e5..3ceb5c20 100644 --- a/po/ka.po +++ b/po/ka.po -@@ -172,6 +172,11 @@ msgstr "პროფილის ადამიანისთვის-სა +@@ -90,6 +90,11 @@ msgstr "პროფილის ადამიანისთვის-სა msgid "Human-readable name of the profile." msgstr "პროფილის ადამიანისთვის-სასიამოვნო წასაკითხი სახელი." @@ -3670,10 +3663,10 @@ index 82f930b1..d52fbd94 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/ne.po b/po/ne.po -index e30b1197..09a4b788 100644 +index 992d7bad..7c560b83 100644 --- a/po/ne.po +++ b/po/ne.po -@@ -2832,8 +2832,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" +@@ -2745,8 +2745,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" #~ msgid "_None (use solid color)" #~ msgstr "कुनै पनि होइन (एउटै रङ प्रयोग गर्नुहोस्)" @@ -3684,7 +3677,7 @@ index e30b1197..09a4b788 100644 #~ msgid "_Use the system fixed width font" #~ msgstr "प्रणाली निश्चित गरिएको फन्ट चौडाइ प्रयोग गर्नुहोस्" -@@ -3425,6 +3425,9 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" +@@ -3338,6 +3338,9 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" #~ msgid "The text you clicked on doesn't seem to be a valid OTP challenge." #~ msgstr "तपाईँले क्लिक गरेको पाठ वैध OTP चुनौती नहुने देखिन्छ ।" @@ -3694,7 +3687,7 @@ index e30b1197..09a4b788 100644 #~ msgid "Switch to Tab 3" #~ msgstr "ट्याब ३ मा स्विच गर्नुहोस्" -@@ -3564,8 +3567,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" +@@ -3477,8 +3480,8 @@ msgstr "%sतर्कहरू पार्स गर्न असफल\n" #~ msgid "_Input Methods" #~ msgstr "आगत विधि" @@ -3706,10 +3699,10 @@ index e30b1197..09a4b788 100644 #~ msgid "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" #~ msgstr "टर्मिनलमा छोडिएको पाठ/सादा गलत ढाँचा (%d) वा लम्बाइ (%d)को थियो\n" diff --git a/po/nl.po b/po/nl.po -index 6c433a25..fd3be16e 100644 +index cb6a5d2a..81f17d0f 100644 --- a/po/nl.po +++ b/po/nl.po -@@ -2806,3 +2806,15 @@ msgstr "Argumenten ontleden is mislukt: %s\n" +@@ -2808,3 +2808,15 @@ msgstr "Argumenten ontleden is mislukt: %s\n" #~ msgid "_Add or Remove…" #~ msgstr "_Toevoegen of verwijderen…" @@ -3886,7 +3879,7 @@ index b25a2cb4..3855b2f3 100644 #: ../src/profile-preferences.glade.h:70 msgid "_Update login records when command is launched" diff --git a/po/pt.po b/po/pt.po -index 6b3188d1..2f78ed6d 100644 +index 1ff7e2f3..6078ee79 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2842,11 +2842,11 @@ msgstr "Falha ao processar argumentos: %s\n" @@ -3916,7 +3909,7 @@ index 6b3188d1..2f78ed6d 100644 #~ msgid "Current Locale" #~ msgstr "Configuração Regional Atual" -@@ -3609,8 +3609,8 @@ msgstr "Falha ao processar argumentos: %s\n" +@@ -3610,8 +3610,8 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "Background image _scrolls" #~ msgstr "Imagem de fundo _rola" @@ -3963,10 +3956,10 @@ index 627aea90..14d04172 100644 #~ msgid "_Unlimited" #~ msgstr "_Neliminat" diff --git a/po/ru.po b/po/ru.po -index efd96c4e..1af341b0 100644 +index bc423106..1d0cf58f 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2746,3 +2746,19 @@ msgstr "Не удалось разобрать аргументы: %s\n" +@@ -2749,3 +2749,19 @@ msgstr "Не удалось разобрать аргументы: %s\n" #~ msgid "_Add or Remove…" #~ msgstr "_Добавить или удалить…" @@ -4054,37 +4047,22 @@ index e6745075..20d303c8 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index 3db69906..901b475a 100644 +index ae803d9a..27a30070 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2866,17 +2866,17 @@ msgstr "Napaka med razčlenjevanjem argumentov: %s\n" - #~ msgid "Default size:" - #~ msgstr "Privzeta velikost:" - --#~ msgid "Title" --#~ msgstr "Naslov" +@@ -2378,3 +2378,15 @@ msgstr "_Zapri okno" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Napaka med razčlenjevanjem argumentov: %s\n" ++ +msgid "Title" +msgstr "Naslov" - --#~ msgid "_Title:" --#~ msgstr "_Naziv:" ++ +msgid "_Title:" +msgstr "_Naziv:" - - #~ msgid "Title and Command" - #~ msgstr "Naziv in ukaz" - --#~ msgid "Set Title" --#~ msgstr "Določitev naziva okna" ++ +msgid "Set Title" +msgstr "Določitev naziva okna" - - #~ msgid "Current Locale" - #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2991,3 +2991,6 @@ msgstr "Napaka med razčlenjevanjem argumentov: %s\n" - - #~ msgid "_Profile Preferences…" - #~ msgstr "Možnosti _profila ..." + +msgid "Transparent background" +msgstr "Prosojno ozadje" @@ -4115,10 +4093,10 @@ index 158f6cb1..a3494fb7 100644 #: ../src/gnome-terminal.glade2.h:86 msgid "_Update login records when command is launched" diff --git a/po/sr.po b/po/sr.po -index a5998996..ff19c5b9 100644 +index af7e13ed..b6ff94d7 100644 --- a/po/sr.po +++ b/po/sr.po -@@ -2776,10 +2776,9 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" +@@ -2780,10 +2780,9 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "GNOME Terminal Client" #~ msgstr "Клијент Гномовог терминала" @@ -4132,7 +4110,7 @@ index a5998996..ff19c5b9 100644 #~ msgid "Title for terminal" #~ msgstr "Наслов за терминал" -@@ -2825,11 +2824,11 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" +@@ -2829,11 +2828,11 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "Default size:" #~ msgstr "Основна величина:" @@ -4148,7 +4126,7 @@ index a5998996..ff19c5b9 100644 #~ msgid "Title and Command" #~ msgstr "Наслов и наредба" -@@ -2837,8 +2836,8 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" +@@ -2841,8 +2840,8 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Неограничено" @@ -4159,7 +4137,7 @@ index a5998996..ff19c5b9 100644 #~ msgid "Current Locale" #~ msgstr "Текући локалитет" -@@ -2848,3 +2847,6 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" +@@ -2852,3 +2851,6 @@ msgstr "Нисам успео да обрадим аргументе: %s\n" #~ msgid "Hidden" #~ msgstr "Скривен" @@ -4219,10 +4197,10 @@ index 45dbad07..852c47cc 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index ab9667fe..d7826a4c 100644 +index d0c3c812..6f4ec4f0 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2775,5 +2775,17 @@ msgstr "Misslyckades med att tolka argument: %s\n" +@@ -2778,5 +2778,17 @@ msgstr "Misslyckades med att tolka argument: %s\n" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -4455,13 +4433,13 @@ index 63263749..496da331 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/tr.po b/po/tr.po -index 7732939b..25605459 100644 +index 42b3bf22..062debe4 100644 --- a/po/tr.po +++ b/po/tr.po -@@ -2759,3 +2759,15 @@ msgstr "Bağımsız değişkenler ayrıştırılamadı: %s\n" - - #~ msgid "_Same as text color" - #~ msgstr "_Metin rengiyle aynı" +@@ -2385,3 +2385,15 @@ msgstr "_Pencereyi Kapat" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Bağımsız değişkenler ayrıştırılamadı: %s\n" + +msgid "Transparent background" +msgstr "Şeffaf arkaplan" @@ -4490,26 +4468,85 @@ index 313f76b9..be608976 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 6a7c02e5..6fa50f40 100644 +index 925bc11a..c7ac1919 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -2453,3 +2453,18 @@ msgstr "Закр_ити вікно" - #, c-format +@@ -2392,67 +2392,17 @@ msgstr "Закр_ити вікно" msgid "Failed to parse arguments: %s\n" msgstr "Не вдається визначити аргументи: %s\n" -+ + +-#~ msgid "org.gnome.Terminal.Nautilus" +-#~ msgstr "org.gnome.Terminal.Nautilus" +msgid "Title" +msgstr "Заголовок" -+ + +-#~ msgid "org.gnome.Nautilus.desktop" +-#~ msgstr "org.gnome.Nautilus.desktop" +msgid "_Title:" +msgstr "За_головок:" -+ + +-#~ msgid "GPL-3.0+ or GFDL-1.3-only" +-#~ msgstr "GPL-3.0+ або GFDL-1.3-only" +msgid "Set Title" +msgstr "Встановлення заголовка" -+ + +-#~ msgid "GPL-3.0+" +-#~ msgstr "GPL-3.0+" +msgid "_Set Title…" +msgstr "_Встановити заголовок…" -+ + +-#~ msgid "https://wiki.gnome.org/Apps/Terminal" +-#~ msgstr "https://wiki.gnome.org/Apps/Terminal" +- +-#~ msgid "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +-#~ msgstr "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +- +-#~ msgid "gnome-terminal" +-#~ msgstr "gnome-terminal" +- +-#~ msgid "org.gnome.Terminal" +-#~ msgstr "org.gnome.Terminal" +- +-#~ msgid "org.gnome.Terminal.desktop" +-#~ msgstr "org.gnome.Terminal.desktop" +- +-#~| msgid "Linux console" +-#~ msgid "console" +-#~ msgstr "консоль" +- +-#~ msgid "keyboard" +-#~ msgstr "клавіатура" +- +-#~ msgid "pointing" +-#~ msgstr "зазначення" +- +-#~ msgid "" +-#~ "https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal." +-#~ "png" +-#~ msgstr "" +-#~ "https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal." +-#~ "png" +- +-#~ msgid "HiDpiIcon" +-#~ msgstr "HiDpiIcon" +- +-#~ msgid "HighContrast" +-#~ msgstr "HighContrast" +- +-#~ msgid "ModernToolkit" +-#~ msgstr "ModernToolkit" +- +-#~ msgid "SearchProvider" +-#~ msgstr "SearchProvider" +- +-#~ msgid "UserDocs" +-#~ msgstr "UserDocs" +- +-#~ msgid "Armenian" +-#~ msgstr "Американське" +- +-#~ msgid "Georgian" +-#~ msgstr "Грузинське" +msgid "Transparent background" +msgstr "Прозоре тло" diff --git a/po/vi.po b/po/vi.po @@ -4631,10 +4668,10 @@ index cb78ec67..a4f3b4dd 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/zh_CN.po b/po/zh_CN.po -index 4fa6ce25..05203670 100644 +index 7026cc62..ddf108b4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2783,17 +2783,17 @@ msgstr "无法处理参数：%s\n" +@@ -2784,17 +2784,17 @@ msgstr "无法处理参数：%s\n" #~ msgid "Default size:" #~ msgstr "默认大小：" @@ -4658,7 +4695,7 @@ index 4fa6ce25..05203670 100644 #~ msgid "Current Locale" #~ msgstr "当前区域" -@@ -2906,3 +2906,6 @@ msgstr "无法处理参数：%s\n" +@@ -2907,3 +2907,6 @@ msgstr "无法处理参数：%s\n" #~ msgid "_Find..." #~ msgstr "查找(_F)..." @@ -4736,10 +4773,10 @@ index 80cb2343..20e2a93c 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.37.1 +2.39.1 -From 8c53962c85817842b8475d74c6f59c56331fc05a Mon Sep 17 00:00:00 2001 +From 2d149670cb2c6c123081622193a7eb4c93a66f05 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 @@ -4756,7 +4793,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 3 files changed, 82 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 3ef53b8b..3d28d5fd 100644 +index 9a41c45f..a8f7f402 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -429,6 +429,10 @@ @@ -4791,10 +4828,10 @@ index 66298100..b2b4e442 100644 static KeyEntry tabs_entries[] = { diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index be8533e6..b46cd89b 100644 +index 61857bfe..98332c6d 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -763,6 +763,81 @@ action_select_all_cb (GSimpleAction *action, +@@ -764,6 +764,81 @@ action_select_all_cb (GSimpleAction *action, vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); } @@ -4876,7 +4913,7 @@ index be8533e6..b46cd89b 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2125,6 +2200,7 @@ terminal_window_init (TerminalWindow *window) +@@ -2165,6 +2240,7 @@ terminal_window_init (TerminalWindow *window) { "paste-uris", action_paste_uris_cb, nullptr, nullptr, nullptr }, { "reset", action_reset_cb, "b", nullptr, nullptr }, { "select-all", action_select_all_cb, nullptr, nullptr, nullptr }, @@ -4885,10 +4922,10 @@ index be8533e6..b46cd89b 100644 { "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr }, { "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr }, -- -2.37.1 +2.39.1 -From f8163016f381f2b55ac14362bc3accbfd12d0628 Mon Sep 17 00:00:00 2001 +From 7a827a8ee62d97a871d2f0e17dd3ea2ee8e6f716 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 @@ -4902,10 +4939,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index df36d254..e1a18266 100644 +index 8949d135..c48b5875 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -815,7 +815,7 @@ terminal_screen_new (GSettings *profile, +@@ -819,7 +819,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ @@ -4915,10 +4952,10 @@ index df36d254..e1a18266 100644 const char *p; -- -2.37.1 +2.39.1 -From d78de24d3509b075e4955515c9f5953a240ea036 Mon Sep 17 00:00:00 2001 +From 857f6b73bfb6f479dd42369c5554497cf0b8eb45 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 @@ -4940,7 +4977,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 8 files changed, 264 insertions(+), 75 deletions(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 3d28d5fd..d67da299 100644 +index a8f7f402..bd08008d 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -4970,10 +5007,10 @@ index 3d28d5fd..d67da299 100644 'Terminal' Title for terminal diff --git a/src/preferences.ui b/src/preferences.ui -index f86f8c98..c45366ae 100644 +index d851bcb6..a9600d9a 100644 --- a/src/preferences.ui +++ b/src/preferences.ui -@@ -2002,7 +2002,7 @@ +@@ -2035,7 +2035,7 @@ True False 0 @@ -4982,7 +5019,7 @@ index f86f8c98..c45366ae 100644 True title-entry -@@ -2022,6 +2022,37 @@ +@@ -2055,6 +2055,37 @@ 1 @@ -5061,7 +5098,7 @@ index 93f1460c..5e816f71 100644 { TERMINAL_EXIT_CLOSE, diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh -index 16e5c326..bb3048fa 100644 +index d0f111a0..1c67e55d 100644 --- a/src/terminal-schemas.hh +++ b/src/terminal-schemas.hh @@ -71,6 +71,7 @@ G_BEGIN_DECLS @@ -5073,10 +5110,10 @@ index 16e5c326..bb3048fa 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.cc b/src/terminal-screen.cc -index e1a18266..7203fb89 100644 +index c48b5875..547ec12e 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -111,8 +111,11 @@ struct _TerminalScreenPrivate +@@ -115,8 +115,11 @@ struct _TerminalScreenPrivate ExecData *exec_data; gboolean between_preexec_and_precmd; @@ -5089,7 +5126,7 @@ index e1a18266..7203fb89 100644 guint contents_changed_source_id; guint shell_preexec_source_id; }; -@@ -129,8 +132,7 @@ enum +@@ -133,8 +136,7 @@ enum enum { PROP_0, PROP_PROFILE, @@ -5099,7 +5136,7 @@ index e1a18266..7203fb89 100644 }; enum -@@ -180,8 +182,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal +@@ -184,8 +186,13 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal static void update_color_scheme (TerminalScreen *screen); @@ -5113,7 +5150,7 @@ index e1a18266..7203fb89 100644 static void terminal_screen_check_extra (TerminalScreen *screen, GdkEvent *event, char **number_info, -@@ -543,6 +550,9 @@ terminal_screen_init (TerminalScreen *screen) +@@ -547,6 +554,9 @@ terminal_screen_init (TerminalScreen *screen) gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); @@ -5123,7 +5160,7 @@ index e1a18266..7203fb89 100644 g_signal_connect (screen, "window-title-changed", G_CALLBACK (terminal_screen_window_title_changed), screen); -@@ -569,9 +579,6 @@ terminal_screen_get_property (GObject *object, +@@ -573,9 +583,6 @@ terminal_screen_get_property (GObject *object, case PROP_TITLE: g_value_set_string (value, terminal_screen_get_title (screen)); break; @@ -5133,7 +5170,7 @@ index e1a18266..7203fb89 100644 default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; -@@ -592,7 +599,6 @@ terminal_screen_set_property (GObject *object, +@@ -596,7 +603,6 @@ terminal_screen_set_property (GObject *object, terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: @@ -5141,7 +5178,7 @@ index e1a18266..7203fb89 100644 /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -688,14 +694,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) +@@ -692,14 +698,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))); @@ -5156,7 +5193,7 @@ index e1a18266..7203fb89 100644 g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -792,7 +790,9 @@ terminal_screen_finalize (GObject *object) +@@ -796,7 +794,9 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -5167,7 +5204,7 @@ index e1a18266..7203fb89 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -812,28 +812,8 @@ terminal_screen_new (GSettings *profile, +@@ -816,28 +816,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)); @@ -5198,7 +5235,7 @@ index e1a18266..7203fb89 100644 vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom); terminal_screen_set_font (screen); -@@ -1045,28 +1025,139 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -1049,28 +1029,139 @@ terminal_screen_exec (TerminalScreen *screen, return TRUE; } @@ -5349,7 +5386,7 @@ index e1a18266..7203fb89 100644 } static void -@@ -1109,9 +1200,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1113,9 +1204,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5361,7 +5398,7 @@ index e1a18266..7203fb89 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1403,7 +1495,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1407,7 +1499,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5369,7 +5406,7 @@ index e1a18266..7203fb89 100644 } GSettings* -@@ -1690,8 +1781,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1695,8 +1786,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5378,7 +5415,7 @@ index e1a18266..7203fb89 100644 if (error) { // FIXMEchpe should be unnecessary, vte already does this internally vte_terminal_set_pty (terminal, nullptr); -@@ -1983,33 +2072,45 @@ terminal_screen_focus_in (GtkWidget *widget, +@@ -1988,33 +2077,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5438,7 +5475,7 @@ index e1a18266..7203fb89 100644 } /** -@@ -2042,7 +2143,9 @@ static void +@@ -2047,7 +2148,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5449,7 +5486,7 @@ index e1a18266..7203fb89 100644 } static void -@@ -2065,8 +2168,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2070,8 +2173,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; @@ -5458,7 +5495,7 @@ index e1a18266..7203fb89 100644 action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); switch (action) -@@ -2110,6 +2211,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2115,6 +2216,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5507,10 +5544,10 @@ index f4ec9047..feeab852 100644 void terminal_screen_get_size (TerminalScreen *screen, diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index b46cd89b..662f8c79 100644 +index 98332c6d..389d4d71 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -781,6 +781,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, +@@ -782,6 +782,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, gtk_widget_destroy (dialog); } @@ -5523,7 +5560,7 @@ index b46cd89b..662f8c79 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2556,8 +2562,7 @@ sync_screen_title (TerminalScreen *screen, +@@ -2628,8 +2634,7 @@ sync_screen_title (TerminalScreen *screen, return; title = terminal_screen_get_title (screen); @@ -5534,10 +5571,10 @@ index b46cd89b..662f8c79 100644 static void -- -2.37.1 +2.39.1 -From 2d5ebcf4b3aa34cf06d90548656c5ecbf805158e Mon Sep 17 00:00:00 2001 +From e509ea2cab9463dd391836db3937ef0503c8652c 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 @@ -5554,7 +5591,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=711060 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index d67da299..09394717 100644 +index bd08008d..e7139454 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -275,6 +275,11 @@ @@ -5570,7 +5607,7 @@ index d67da299..09394717 100644 'close' What to do with the terminal when the child command exits diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh -index bb3048fa..d5ee2a88 100644 +index 1c67e55d..443ebae4 100644 --- a/src/terminal-schemas.hh +++ b/src/terminal-schemas.hh @@ -70,6 +70,7 @@ G_BEGIN_DECLS @@ -5582,10 +5619,10 @@ index bb3048fa..d5ee2a88 100644 #define TERMINAL_PROFILE_TITLE_MODE_KEY "title-mode" #define TERMINAL_PROFILE_TITLE_KEY "title" diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index 7203fb89..d7b29a46 100644 +index 547ec12e..fe410fdf 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -110,7 +110,9 @@ struct _TerminalScreenPrivate +@@ -114,7 +114,9 @@ struct _TerminalScreenPrivate guint idle_exec_source; ExecData *exec_data; @@ -5595,7 +5632,7 @@ index 7203fb89..d7b29a46 100644 gboolean user_title; /* title was manually set */ char *current_cmdline; char *raw_title; -@@ -1140,6 +1142,26 @@ terminal_screen_format_title (TerminalScreen *screen, +@@ -1144,6 +1146,26 @@ terminal_screen_format_title (TerminalScreen *screen, add_sep = FALSE; } @@ -5622,7 +5659,7 @@ index 7203fb89..d7b29a46 100644 if (*titleptr == nullptr || strcmp (title->str, *titleptr) != 0) { g_free (*titleptr); -@@ -1169,6 +1191,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1173,6 +1195,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, GObject *object = G_OBJECT (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen); TerminalWindow *window; @@ -5630,7 +5667,7 @@ index 7203fb89..d7b29a46 100644 g_object_freeze_notify (object); -@@ -1203,7 +1226,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1207,7 +1230,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) || prop_name == I_(TERMINAL_PROFILE_TITLE_KEY)) { @@ -5639,7 +5676,7 @@ index 7203fb89..d7b29a46 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1231,6 +1254,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1235,6 +1258,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) update_color_scheme (screen); @@ -5653,7 +5690,7 @@ index 7203fb89..d7b29a46 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)); -@@ -1295,6 +1325,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1299,6 +1329,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); } @@ -5663,7 +5700,7 @@ index 7203fb89..d7b29a46 100644 g_object_thaw_notify (object); } -@@ -2143,6 +2176,9 @@ static void +@@ -2148,6 +2181,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5673,7 +5710,7 @@ index 7203fb89..d7b29a46 100644 terminal_screen_set_dynamic_title (screen, vte_terminal_get_window_title (vte_terminal), FALSE); -@@ -2250,6 +2286,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) +@@ -2255,6 +2291,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) cmdline = nullptr; _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); @@ -5682,7 +5719,7 @@ index 7203fb89..d7b29a46 100644 out: priv->contents_changed_source_id = 0; return G_SOURCE_REMOVE; -@@ -2342,6 +2380,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2347,6 +2385,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); @@ -5690,7 +5727,7 @@ index 7203fb89..d7b29a46 100644 priv->between_preexec_and_precmd = FALSE; if (priv->contents_changed_source_id != 0) -@@ -2361,6 +2400,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2366,6 +2405,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"); @@ -5699,7 +5736,7 @@ index 7203fb89..d7b29a46 100644 } static gboolean -@@ -2382,6 +2423,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) +@@ -2387,6 +2428,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) cmdline = nullptr; _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); @@ -5709,10 +5746,10 @@ index 7203fb89..d7b29a46 100644 retval = G_SOURCE_REMOVE; -- -2.37.1 +2.39.1 -From 6fc30d72715fbfae6f3499f64abee9c2d634e0b3 Mon Sep 17 00:00:00 2001 +From 270d60c07f79325cf5488a836cb20a32d827d004 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 @@ -5728,10 +5765,10 @@ https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc -index d7b29a46..a3c30644 100644 +index fe410fdf..4fc15e04 100644 --- a/src/terminal-screen.cc +++ b/src/terminal-screen.cc -@@ -858,6 +858,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -862,6 +862,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, TerminalScreen *parent_screen, GCancellable *cancellable, GError **error) @@ -5757,7 +5794,7 @@ index d7b29a46..a3c30644 100644 { g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); -@@ -869,8 +888,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -873,8 +892,20 @@ 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); @@ -5797,10 +5834,10 @@ index feeab852..b5ab7908 100644 GSettings *profile); GSettings* terminal_screen_get_profile (TerminalScreen *screen); diff --git a/src/terminal-window.cc b/src/terminal-window.cc -index 662f8c79..1569bf1e 100644 +index 389d4d71..d69cf1f0 100644 --- a/src/terminal-window.cc +++ b/src/terminal-window.cc -@@ -416,8 +416,30 @@ action_new_terminal_cb (GSimpleAction *action, +@@ -417,8 +417,30 @@ action_new_terminal_cb (GSimpleAction *action, terminal_window_switch_screen (window, screen); gtk_widget_grab_focus (GTK_WIDGET (screen)); @@ -5834,5 +5871,5 @@ index 662f8c79..1569bf1e 100644 if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW) gtk_window_present (GTK_WINDOW (window)); -- -2.37.1 +2.39.1 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index 275ff99..73f17fe 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.45.90 -Release: 2%{?dist} +Version: 3.46.7 +Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ @@ -17,8 +17,6 @@ Source0: https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{v Source1: org.gnome.Terminal.gschema.override Patch0: gnome-terminal-cntr-ntfy-autottl-ts.patch -Patch1: gnome-terminal-3.45.90-nautilus-extension.patch -Patch2: gnome-terminal-3.45.90-xml-namespaces.patch BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -90,6 +88,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de %doc README.md %{_bindir}/gnome-terminal %{_datadir}/applications/org.gnome.Terminal.desktop +%{_datadir}/applications/org.gnome.Terminal.Preferences.desktop +%{_libexecdir}/gnome-terminal-preferences %{_libexecdir}/gnome-terminal-server %{_datadir}/dbus-1/services/org.gnome.Terminal.service %{_datadir}/glib-2.0/schemas/org.gnome.Terminal.gschema.xml @@ -97,6 +97,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de %{_datadir}/gnome-shell %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal-symbolic.svg +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Terminal.Preferences.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Terminal.Preferences-symbolic.svg +%dir %{_datadir}/xdg-terminals +%{_datadir}/xdg-terminals/org.gnome.Terminal.desktop %dir %{_libdir}/gnome-terminal %{_libdir}/gnome-terminal/gschemas.compiled %{_mandir}/man1/gnome-terminal.1* @@ -108,6 +112,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.de %{_metainfodir}/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Mon Jan 23 2023 David King - 3.46.7-1 +- Update to 3.46.7 (#2155523) + * Thu Jan 19 2023 Fedora Release Engineering - 3.45.90-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a95da6b..b4094f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.45.90.tar.bz2) = 941be0bac2f440c01bfb1482b30964ce1300aad8e1f95eacc8f1beccc26bc521a96267d118b176686eca2317edb8517f30a348d4df81d09bed1a44fa9b46745a +SHA512 (gnome-terminal-3.46.7.tar.bz2) = b53ec9fd1bd18e51dfc9d5d957082fb1478a824ceb098b0dda2ed8417c4cae4727435f4bce22a949214bdd39abc87821beb36c9e9863691ae0a20f11b34e3335