scm-commits September 2021

scm-commits@lists.fedoraproject.org

1 participants
19175 discussions

decathorpe pushed to rust-js-sys (rawhide). "Update to version 0.3.55; Fixes RHBZ#2002390"
by notifications＠fedoraproject.org 01 Oct '21

01 Oct '21

Notification time stamped 2021-09-30 23:14:10 UTC From 87b1cf36884490b856a76977e74240d64ab5ee70 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:56:57 +0000 Subject: Update to version 0.3.55; Fixes RHBZ#2002390 --- diff --git a/rust-js-sys.spec b/rust-js-sys.spec index e29ab37..a1da386 100644 --- a/rust-js-sys.spec +++ b/rust-js-sys.spec @@ -6,7 +6,7 @@ %global crate js-sys Name: rust-%{crate} -Version: 0.3.53 +Version: 0.3.55 Release: %autorelease Summary: Bindings for all JS global objects and functions diff --git a/sources b/sources index f151e5e..8b52bf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (js-sys-0.3.53.crate) = 286278089fff1eefcf206c49c4ee35a3197129cff7bfab93f36239d975732da720d22134711d6c201b12e49f05022934dcc9cb41c4982bc99d29cd7c4a8de878 +SHA512 (js-sys-0.3.55.crate) = bd51d61684b3683d5b80df42eb80cb2e4688096bf14fcbd30234503709b1730ab25c7b58112516aeb5d7f44ae20e0ba08bdfddb0518a20603bbb4ca74544d4ac https://src.fedoraproject.org/rpms/rust-js-sys/c/87b1cf36884490b856a76977e7…

1 0

decathorpe pushed to rust-wasm-bindgen (f34). "Update to version 0.2.78; Fixes RHBZ#2002375"
by notifications＠fedoraproject.org 01 Oct '21

01 Oct '21

Notification time stamped 2021-09-30 23:01:15 UTC From db134a7d9fc418a7b7cd6df44cf8b9be7bebc4f6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:39:23 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002375 --- diff --git a/rust-wasm-bindgen.spec b/rust-wasm-bindgen.spec index 0975d55..8f558bb 100644 --- a/rust-wasm-bindgen.spec +++ b/rust-wasm-bindgen.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Easy support for interacting between JS and Rust diff --git a/sources b/sources index 87beec0..d839e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-0.2.76.crate) = 8fa02f42c55a91d9a4c4a8c8752a09360c86993405cb8de2d0309f4bfd09c99c6353af753d1927a12467f489b660ef9f293dc32b362ce0226fe65b642de0c98e +SHA512 (wasm-bindgen-0.2.78.crate) = bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9 https://src.fedoraproject.org/rpms/rust-wasm-bindgen/c/db134a7d9fc418a7b7cd…

1 0

decathorpe pushed to rust-wasm-bindgen (f35). "Update to version 0.2.78; Fixes RHBZ#2002375"
by notifications＠fedoraproject.org 01 Oct '21

01 Oct '21

Notification time stamped 2021-09-30 23:00:41 UTC From db134a7d9fc418a7b7cd6df44cf8b9be7bebc4f6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:39:23 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002375 --- diff --git a/rust-wasm-bindgen.spec b/rust-wasm-bindgen.spec index 0975d55..8f558bb 100644 --- a/rust-wasm-bindgen.spec +++ b/rust-wasm-bindgen.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Easy support for interacting between JS and Rust diff --git a/sources b/sources index 87beec0..d839e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-0.2.76.crate) = 8fa02f42c55a91d9a4c4a8c8752a09360c86993405cb8de2d0309f4bfd09c99c6353af753d1927a12467f489b660ef9f293dc32b362ce0226fe65b642de0c98e +SHA512 (wasm-bindgen-0.2.78.crate) = bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9 https://src.fedoraproject.org/rpms/rust-wasm-bindgen/c/db134a7d9fc418a7b7cd…

1 0

decathorpe pushed to rust-wasm-bindgen (rawhide). "Update to version 0.2.78; Fixes RHBZ#2002375"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:57:39 UTC From db134a7d9fc418a7b7cd6df44cf8b9be7bebc4f6 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:39:23 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002375 --- diff --git a/rust-wasm-bindgen.spec b/rust-wasm-bindgen.spec index 0975d55..8f558bb 100644 --- a/rust-wasm-bindgen.spec +++ b/rust-wasm-bindgen.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Easy support for interacting between JS and Rust diff --git a/sources b/sources index 87beec0..d839e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-0.2.76.crate) = 8fa02f42c55a91d9a4c4a8c8752a09360c86993405cb8de2d0309f4bfd09c99c6353af753d1927a12467f489b660ef9f293dc32b362ce0226fe65b642de0c98e +SHA512 (wasm-bindgen-0.2.78.crate) = bedeb2828d1e74b1e373bdf34dc2eaec70dd523e9ed96a341da1ab3729a7cf8470a828ddb9cfd4cf15af6e2fff75b4368553ab4f6f02c8dec9419dcdd7578de9 https://src.fedoraproject.org/rpms/rust-wasm-bindgen/c/db134a7d9fc418a7b7cd…

1 0

decathorpe pushed to rust-wasm-bindgen-macro (f34). "Update to version 0.2.78; Fixes RHBZ#2002383"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:43:57 UTC From 0378a7c418f0c055e286534591ffec5e8f1a5406 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:38:24 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002383 --- diff --git a/rust-wasm-bindgen-macro.spec b/rust-wasm-bindgen-macro.spec index a8fb816..c6d1963 100644 --- a/rust-wasm-bindgen-macro.spec +++ b/rust-wasm-bindgen-macro.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen-macro Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Definition of the #[wasm_bindgen] attribute diff --git a/sources b/sources index 9039008..6e50069 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-macro-0.2.76.crate) = 529926b78d3d3c6d8dcc34f2d7b2ef334aa76e0050814c990cab0f62e5e08a67f4c56581206bbafe2e86614abbef757fc7d6548a6e27797ed313fa188997f91e +SHA512 (wasm-bindgen-macro-0.2.78.crate) = 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d https://src.fedoraproject.org/rpms/rust-wasm-bindgen-macro/c/0378a7c418f0c0…

1 0

decathorpe pushed to rust-wasm-bindgen-macro (f35). "Update to version 0.2.78; Fixes RHBZ#2002383"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:43:40 UTC From 0378a7c418f0c055e286534591ffec5e8f1a5406 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:38:24 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002383 --- diff --git a/rust-wasm-bindgen-macro.spec b/rust-wasm-bindgen-macro.spec index a8fb816..c6d1963 100644 --- a/rust-wasm-bindgen-macro.spec +++ b/rust-wasm-bindgen-macro.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen-macro Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Definition of the #[wasm_bindgen] attribute diff --git a/sources b/sources index 9039008..6e50069 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-macro-0.2.76.crate) = 529926b78d3d3c6d8dcc34f2d7b2ef334aa76e0050814c990cab0f62e5e08a67f4c56581206bbafe2e86614abbef757fc7d6548a6e27797ed313fa188997f91e +SHA512 (wasm-bindgen-macro-0.2.78.crate) = 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d https://src.fedoraproject.org/rpms/rust-wasm-bindgen-macro/c/0378a7c418f0c0…

1 0

decathorpe pushed to rust-wasm-bindgen-macro (rawhide). "Update to version 0.2.78; Fixes RHBZ#2002383"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:43:25 UTC From 0378a7c418f0c055e286534591ffec5e8f1a5406 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:38:24 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002383 --- diff --git a/rust-wasm-bindgen-macro.spec b/rust-wasm-bindgen-macro.spec index a8fb816..c6d1963 100644 --- a/rust-wasm-bindgen-macro.spec +++ b/rust-wasm-bindgen-macro.spec @@ -6,7 +6,7 @@ %global crate wasm-bindgen-macro Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Definition of the #[wasm_bindgen] attribute diff --git a/sources b/sources index 9039008..6e50069 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-macro-0.2.76.crate) = 529926b78d3d3c6d8dcc34f2d7b2ef334aa76e0050814c990cab0f62e5e08a67f4c56581206bbafe2e86614abbef757fc7d6548a6e27797ed313fa188997f91e +SHA512 (wasm-bindgen-macro-0.2.78.crate) = 3389922198b0d5c19163f4de345e0cd7a3c0609d48ff933bd5af0cfb205463632878b5d60bfeeb8dd8f8a98f28f23c5185dd6d8389f599f31176297c944b595d https://src.fedoraproject.org/rpms/rust-wasm-bindgen-macro/c/0378a7c418f0c0…

1 0

amigadave pushed to gnome-terminal (f35). "Update to 3.42.0"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:39:46 UTC From d57e059e5015e873e08f58d149efae1dc95ca35c Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Sep 28 2021 20:12:37 +0000 Subject: Update to 3.42.0 --- diff --git a/.gitignore b/.gitignore index f430506..7ae114d 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,5 @@ gnome-terminal-2.31.3.tar.bz2 /gnome-terminal-3.40.1.tar.xz /gnome-terminal-3.40.2.tar.xz /gnome-terminal-3.40.3.tar.xz +/gnome-terminal-3.41.0.tar.xz +/gnome-terminal-3.42.0.tar.bz2 diff --git a/gnome-terminal-cntr-ntfy-autottl-ts.patch b/gnome-terminal-cntr-ntfy-autottl-ts.patch index 6058879..04fa0c4 100644 --- a/gnome-terminal-cntr-ntfy-autottl-ts.patch +++ b/gnome-terminal-cntr-ntfy-autottl-ts.patch @@ -1,7 +1,249 @@ -From 49ed8af3bbeb7b72950b7308c72f83a9403dd883 Mon Sep 17 00:00:00 2001 +From bda3c4bd394cb70b336ef6359e6760bb006c825b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marek=20=C4=8Cernock=C3=BD?= <marek(a)manet.cz> +Date: Fri, 24 Sep 2021 15:06:52 +0200 +Subject: [PATCH 01/17] Updated Czech translation + +--- + po/cs.po | 120 +++++++++++-------------------------------------------- + 1 file changed, 23 insertions(+), 97 deletions(-) + +diff --git a/po/cs.po b/po/cs.po +index 1beaf216..5a4d02a4 100644 +--- a/po/cs.po ++++ b/po/cs.po +@@ -14,10 +14,10 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: gnome-terminal\n" ++"Project-Id-Version: gnome-terminal gnome-41\n" + "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-terminal/issues\n" +-"POT-Creation-Date: 2021-07-31 12:57+0000\n" +-"PO-Revision-Date: 2021-02-07 19:52+0100\n" ++"POT-Creation-Date: 2021-09-22 16:39+0000\n" ++"PO-Revision-Date: 2021-09-24 15:05+0200\n" + "Last-Translator: Marek Černocký <marek(a)manet.cz>\n" + "Language-Team: čeština <gnome-cs-list(a)gnome.org>\n" + "Language: cs\n" +@@ -28,32 +28,14 @@ msgstr "" + "X-Generator: Gtranslator 2.91.7\n" + + #: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:35 +-msgid "org.gnome.Terminal.Nautilus" +-msgstr "" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36 +-msgid "org.gnome.Nautilus.desktop" +-msgstr "" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:37 +-#: data/org.gnome.Terminal.metainfo.xml.in:36 +-msgid "GPL-3.0+ or GFDL-1.3-only" +-msgstr "GPL-3.0+ nebo GFDL-1.3 výhradně" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38 +-#: data/org.gnome.Terminal.metainfo.xml.in:37 +-msgid "GPL-3.0+" +-msgstr "GPL-3.0+" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:39 + msgid "Terminal plugin for Files" + msgstr "Zásuvný modul Terminál pro Soubory" + +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:40 ++#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:36 + msgid "Open a terminal from Files" + msgstr "Otevírá terminál z aplikace Soubory" + +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:42 ++#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:38 + msgid "" + "Open Terminal is a plugin for the Files application that adds a menu item to " + "the context menu to open a terminal in the currently browsed directory." +@@ -61,28 +43,8 @@ msgstr "" + "Otevřít terminál je zásuvný modul pro aplikaci Soubory, který přidává do " + "kontextové nabídky položku pro otevření terminálu v právě procházené složce." + +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:44 +-#: data/org.gnome.Terminal.metainfo.xml.in:59 +-msgid "https://wiki.gnome.org/Apps/Terminal" +-msgstr "https://wiki.gnome.org/Apps/Terminal" +- +-#. This is the name of a colour scheme +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:45 +-#: data/org.gnome.Terminal.metainfo.xml.in:60 src/preferences.ui:214 +-msgid "GNOME" +-msgstr "GNOME" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:46 +-#: data/org.gnome.Terminal.metainfo.xml.in:61 +-msgid "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +-msgstr "https://wiki.gnome.org/Apps/Terminal/ReportingBugs" +- +-#: data/org.gnome.Terminal.Nautilus.metainfo.xml.in:47 +-msgid "gnome-terminal" +-msgstr "" +- + #: data/org.gnome.Terminal.desktop.in:3 +-#: data/org.gnome.Terminal.metainfo.xml.in:38 src/server.cc:150 ++#: data/org.gnome.Terminal.metainfo.xml.in:34 src/server.cc:150 + #: src/terminal-accels.cc:232 src/terminal-menubar.ui.in:144 + #: src/terminal-tab-label.cc:81 src/terminal-window.cc:1894 + #: src/terminal-window.cc:2160 src/terminal-window.cc:2443 src/terminal.cc:570 +@@ -90,7 +52,7 @@ msgid "Terminal" + msgstr "Terminál" + + #: data/org.gnome.Terminal.desktop.in:4 +-#: data/org.gnome.Terminal.metainfo.xml.in:39 ++#: data/org.gnome.Terminal.metainfo.xml.in:35 + msgid "Use the command line" + msgstr "Používejte příkazový řádek" + +@@ -100,7 +62,7 @@ msgstr "shell;prompt;výzva;příkaz;příkazový řádek;příkazová řádka;" + + #: data/org.gnome.Terminal.desktop.in:8 + msgid "org.gnome.Terminal" +-msgstr "" ++msgstr "org.gnome.Terminal" + + #: data/org.gnome.Terminal.desktop.in:17 src/terminal-accels.cc:127 + msgid "New Window" +@@ -110,11 +72,7 @@ msgstr "Nové okno" + msgid "Preferences" + msgstr "Předvolby" + +-#: data/org.gnome.Terminal.metainfo.xml.in:35 +-msgid "org.gnome.Terminal.desktop" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:41 ++#: data/org.gnome.Terminal.metainfo.xml.in:37 + msgid "" + "GNOME Terminal is a terminal emulator application for accessing a UNIX shell " + "environment which can be used to run programs available on your system." +@@ -123,51 +81,13 @@ msgstr "" + "UNIXového shellu a v něm umožňuje spouštět programy dostupné ve vašem " + "systému." + +-#: data/org.gnome.Terminal.metainfo.xml.in:42 ++#: data/org.gnome.Terminal.metainfo.xml.in:38 + msgid "" + "It supports several profiles, multiple tabs and implements several keyboard " + "shortcuts." + msgstr "" + "Podporuje více profilů, více terminálů v kartách a řadu klávesových zkratek." + +-#: data/org.gnome.Terminal.metainfo.xml.in:45 +-msgid "console" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:46 +-msgid "keyboard" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:47 +-msgid "pointing" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:50 +-msgid "" +-"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.p…" +-msgstr "" +-"https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.p…" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:53 +-msgid "HiDpiIcon" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:54 +-msgid "HighContrast" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:55 +-msgid "ModernToolkit" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:56 +-msgid "SearchProvider" +-msgstr "" +- +-#: data/org.gnome.Terminal.metainfo.xml.in:57 +-msgid "UserDocs" +-msgstr "" +- + #. Translators: Keep single quote please! + #: src/org.gnome.Terminal.gschema.xml:133 + msgctxt "visible-name" +@@ -959,6 +879,11 @@ msgstr "spustit příkaz znovu" + msgid "Hold the terminal open" + msgstr "nechat terminál otevřený" + ++#. This is the name of a colour scheme ++#: src/preferences.ui:214 ++msgid "GNOME" ++msgstr "GNOME" ++ + #. This is the name of a colour scheme + #: src/preferences.ui:217 + msgid "Tango" +@@ -1760,7 +1685,7 @@ msgstr "_4. 132 × 42" + msgid "_Inspector" + msgstr "_Inspektor" + +-#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1540 ++#: src/terminal-headermenu.ui:106 src/terminal-screen.cc:1543 + #: src/terminal-window.cc:1788 + msgid "_Preferences" + msgstr "_Předvolby" +@@ -2257,29 +2182,29 @@ msgstr "Klávesové zkratky" + msgid "Profiles" + msgstr "Profily" + +-#: src/terminal-screen.cc:1425 ++#: src/terminal-screen.cc:1428 + msgid "No command supplied nor shell requested" + msgstr "Není ani zadán příkaz ani požadován shell" + +-#: src/terminal-screen.cc:1541 src/terminal-screen.cc:1888 ++#: src/terminal-screen.cc:1544 src/terminal-screen.cc:1891 + msgid "_Relaunch" + msgstr "_Spustit znovu" + +-#: src/terminal-screen.cc:1544 ++#: src/terminal-screen.cc:1547 + msgid "There was an error creating the child process for this terminal" + msgstr "Při vytváření procesu potomka pro tento terminál došlo k chybě" + +-#: src/terminal-screen.cc:1892 ++#: src/terminal-screen.cc:1895 + #, c-format + msgid "The child process exited normally with status %d." + msgstr "Proces potomka skončil normálně se stavovým kódem %d." + +-#: src/terminal-screen.cc:1895 ++#: src/terminal-screen.cc:1898 + #, c-format + msgid "The child process was aborted by signal %d." + msgstr "Proces potomka byl zrušen na základě signálu %d." + +-#: src/terminal-screen.cc:1898 ++#: src/terminal-screen.cc:1901 + msgid "The child process was aborted." + msgstr "Proces potomka byl zrušen." + +@@ -2452,3 +2377,4 @@ msgstr "_Zavřít okno" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Selhala analýza argumentů: %s\n" ++ +-- +2.32.0 + + +From 04e0dca711e3c76cf1a47862b4c3979fa932521b Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Mon, 12 May 2014 14:57:18 +0200 -Subject: [PATCH 01/16] Restore transparency +Subject: [PATCH 02/17] Restore transparency The transparency settings were removed as a side effect of 2bff4b63ed3ceef6055e35563e9b0b33ad57349d @@ -18,14 +260,14 @@ Some changes by Peter Weber <peter.weber(a)mailbox.org> --- src/org.gnome.Terminal.gschema.xml | 10 +++++++ src/preferences.ui | 47 ++++++++++++++++++++++++++++++ - src/profile-editor.c | 16 ++++++++++ - src/terminal-schemas.h | 3 ++ - src/terminal-screen.c | 22 +++++++++++++- - src/terminal-window.c | 7 +++++ - 6 files changed, 104 insertions(+), 1 deletion(-) + src/profile-editor.cc | 19 ++++++++++++ + src/terminal-schemas.hh | 3 ++ + src/terminal-screen.cc | 22 +++++++++++++- + src/terminal-window.cc | 7 +++++ + 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 26b96acfa737..b6c42ec62a16 100644 +index 26b96acf..b6c42ec6 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -349,6 +349,16 @@ @@ -46,7 +288,7 @@ index 26b96acfa737..b6c42ec62a16 100644  diff --git a/src/preferences.ui b/src/preferences.ui -index d1aca7b2c35c..64f8295bf2b0 100644 +index d1aca7b2..64f8295b 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -95,6 +95,11 @@ @@ -110,37 +352,40 @@ index d1aca7b2c35c..64f8295bf2b0 100644 </object> </child> </object> -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 4098f90bf10e..35bd24791417 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1431,6 +1431,22 @@ profile_prefs_load (const char *uuid, GSettings *profile) - profile_prefs_settings_bind (profile, TERMINAL_PROFILE_ENABLE_SIXEL_KEY, w, - "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index a99fb892..3d50524d 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1492,6 +1492,25 @@ profile_prefs_load (const char *uuid, GSettings *profile) + GSettingsBindFlags(G_SETTINGS_BIND_GET | + G_SETTINGS_BIND_SET)); gtk_widget_set_visible (w, (vte_get_feature_flags() & VTE_FEATURE_FLAG_SIXEL) != 0); + + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, + gtk_builder_get_object (builder, "use-transparent-background"), + "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_USE_TRANSPARENT_BACKGROUND, + gtk_builder_get_object (builder, "background-transparent-scale"), + "sensitive", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_NO_SENSITIVITY)); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT, + gtk_builder_get_object (builder, "background-transparent-adjustment"), + "value", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); } /* Called once per Preferences window, to destroy stuff that doesn't depend on the profile being edited */ -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index b146ba82eae3..d2917fac37f2 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index b146ba82..d2917fac 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh @@ -78,6 +78,9 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_VISIBLE_NAME_KEY "visible-name" #define TERMINAL_PROFILE_WORD_CHAR_EXCEPTIONS_KEY "word-char-exceptions" @@ -151,11 +396,11 @@ index b146ba82eae3..d2917fac37f2 100644 #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY "confirm-close" #define TERMINAL_SETTING_CONTEXT_INFO_KEY "context-info" #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY "default-show-menubar" -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 5c9195c1f459..3a26a212e3dd 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1075,7 +1075,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index e2e7d2bc..5feb8f7e 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -1082,7 +1082,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,16 +411,16 @@ index 5c9195c1f459..3a26a212e3dd 100644 update_color_scheme (screen); if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY)) -@@ -1160,6 +1162,8 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; - GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; +@@ -1167,6 +1169,8 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; + GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; + GtkWidget *toplevel; + gboolean transparent; gboolean use_theme_colors; context = gtk_widget_get_style_context (widget); -@@ -1203,6 +1207,18 @@ update_color_scheme (TerminalScreen *screen) +@@ -1210,6 +1214,18 @@ update_color_scheme (TerminalScreen *screen) } colors = terminal_g_settings_get_rgba_palette (priv->profile, TERMINAL_PROFILE_PALETTE_KEY, &n_colors); @@ -194,22 +439,22 @@ index 5c9195c1f459..3a26a212e3dd 100644 vte_terminal_set_colors (VTE_TERMINAL (screen), &fg, &bg, colors, n_colors); vte_terminal_set_color_bold (VTE_TERMINAL (screen), boldp); -@@ -1210,6 +1226,10 @@ update_color_scheme (TerminalScreen *screen) +@@ -1217,6 +1233,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); + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) + gtk_widget_set_app_paintable (toplevel, transparent); } static void -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 537cd2e1d8b1..d87bbb6f24ec 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -2115,6 +2115,8 @@ terminal_window_init (TerminalWindow *window) +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 02a96d81..0b68a8e9 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -2119,6 +2119,8 @@ terminal_window_init (TerminalWindow *window) }; TerminalWindowPrivate *priv; TerminalApp *app; @@ -218,26 +463,26 @@ index 537cd2e1d8b1..d87bbb6f24ec 100644 GSettings *gtk_debug_settings; GtkWindowGroup *window_group; // GtkAccelGroup *accel_group; -@@ -2130,6 +2132,11 @@ terminal_window_init (TerminalWindow *window) +@@ -2134,6 +2136,11 @@ terminal_window_init (TerminalWindow *window) gtk_widget_init_template (GTK_WIDGET (window)); + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + visual = gdk_screen_get_rgba_visual (screen); -+ if (visual != NULL) ++ if (visual != nullptr) + gtk_widget_set_visual (GTK_WIDGET (window), visual); + uuid_generate (u); uuid_unparse (u, uuidstr); priv->uuid = g_strdup (uuidstr); -- -2.31.1 +2.32.0 -From 10b806c480110bb8dae3bdae87f4c7f366e632cc Mon Sep 17 00:00:00 2001 +From b90dada28760377e8cd7aaa1ab48b3645d761aee Mon Sep 17 00:00:00 2001 From: Lars Uebernickel <lars.uebernickel(a)canonical.com> Date: Wed, 28 May 2014 14:11:02 +0200 -Subject: [PATCH 02/16] window: Make the drawing robust across all themes +Subject: [PATCH 03/17] window: Make the drawing robust across all themes There are lots of themes out there in the wild that do not specify a background-color for all widgets and the default is transparent. This @@ -250,14 +495,14 @@ can avoid this by ensuring that the window always renders a background. https://bugzilla.gnome.org/show_bug.cgi?id=730016 --- - src/terminal-window.c | 21 +++++++++++++++++++++ + src/terminal-window.cc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) -diff --git a/src/terminal-window.c b/src/terminal-window.c -index d87bbb6f24ec..c79e06387c94 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -1974,6 +1974,26 @@ terminal_window_realize (GtkWidget *widget) +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 0b68a8e9..5019a3ac 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -1978,6 +1978,26 @@ terminal_window_realize (GtkWidget *widget) terminal_window_update_size (window); } @@ -284,7 +529,7 @@ index d87bbb6f24ec..c79e06387c94 100644 static gboolean terminal_window_state_event (GtkWidget *widget, GdkEventWindowState *event) -@@ -2291,6 +2311,7 @@ terminal_window_class_init (TerminalWindowClass *klass) +@@ -2296,6 +2316,7 @@ terminal_window_class_init (TerminalWindowClass *klass) widget_class->show = terminal_window_show; widget_class->realize = terminal_window_realize; @@ -293,25 +538,25 @@ index d87bbb6f24ec..c79e06387c94 100644 widget_class->screen_changed = terminal_window_screen_changed; widget_class->style_updated = terminal_window_style_updated; -- -2.31.1 +2.32.0 -From 31af2e59bb75553c24ee53deeccb22aab1438ade Mon Sep 17 00:00:00 2001 +From 42f75b51144a6a93e442334b4793f4f885a32d4c Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" <otaylor(a)fishsoup.net> Date: Fri, 13 Nov 2015 15:16:42 +0100 -Subject: [PATCH 03/16] screen, window: Extra padding around transparent +Subject: [PATCH 04/17] screen, window: Extra padding around transparent terminals in Wayland https://bugzilla.redhat.com/show_bug.cgi?id=1207943 --- - src/terminal-screen.c | 41 +++++++++++++++++++++++++++++++++++++---- - src/terminal-window.c | 18 ++++++++++++------ + src/terminal-screen.cc | 41 +++++++++++++++++++++++++++++++++++++---- + src/terminal-window.cc | 18 ++++++++++++------ 2 files changed, 49 insertions(+), 10 deletions(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 3a26a212e3dd..2ed7fdea8349 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 5feb8f7e..c1cf61f1 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -152,6 +152,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, @@ -329,7 +574,7 @@ index 3a26a212e3dd..2ed7fdea8349 100644 terminal_class->child_exited = terminal_screen_child_exited; -@@ -1147,6 +1150,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1154,6 +1157,32 @@ terminal_screen_profile_changed_cb (GSettings *profile, g_object_thaw_notify (object); } @@ -342,7 +587,7 @@ index 3a26a212e3dd..2ed7fdea8349 100644 + GtkWidget *toplevel; + + toplevel = gtk_widget_get_toplevel (widget); -+ if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) ++ if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) + { + gboolean transparent; + @@ -362,26 +607,26 @@ index 3a26a212e3dd..2ed7fdea8349 100644 static void update_color_scheme (TerminalScreen *screen) { -@@ -1162,7 +1191,6 @@ update_color_scheme (TerminalScreen *screen) - GdkRGBA *cursor_bgp = NULL, *cursor_fgp = NULL; - GdkRGBA *highlight_bgp = NULL, *highlight_fgp = NULL; +@@ -1169,7 +1198,6 @@ update_color_scheme (TerminalScreen *screen) + GdkRGBA *cursor_bgp = nullptr, *cursor_fgp = nullptr; + GdkRGBA *highlight_bgp = nullptr, *highlight_fgp = nullptr; GtkStyleContext *context; - GtkWidget *toplevel; gboolean transparent; gboolean use_theme_colors; -@@ -1227,9 +1255,7 @@ update_color_scheme (TerminalScreen *screen) +@@ -1234,9 +1262,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); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); -- if (toplevel != NULL && gtk_widget_is_toplevel (toplevel)) +- if (toplevel != nullptr && gtk_widget_is_toplevel (toplevel)) - gtk_widget_set_app_paintable (toplevel, transparent); + update_toplevel_transparency (screen); } static void -@@ -1746,6 +1772,13 @@ terminal_screen_do_popup (TerminalScreen *screen, +@@ -1756,6 +1782,13 @@ terminal_screen_do_popup (TerminalScreen *screen, terminal_screen_popup_info_unref (info); } @@ -395,11 +640,11 @@ index 3a26a212e3dd..2ed7fdea8349 100644 static gboolean terminal_screen_button_press (GtkWidget *widget, GdkEventButton *event) -diff --git a/src/terminal-window.c b/src/terminal-window.c -index c79e06387c94..6d1fa95d8b3a 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -1980,15 +1980,21 @@ terminal_window_draw (GtkWidget *widget, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 5019a3ac..5513eedc 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -1984,15 +1984,21 @@ terminal_window_draw (GtkWidget *widget, { if (gtk_widget_get_app_paintable (widget)) { @@ -428,13 +673,13 @@ index c79e06387c94..6d1fa95d8b3a 100644 return GTK_WIDGET_CLASS (terminal_window_parent_class)->draw (widget, cr); -- -2.31.1 +2.32.0 -From efb58ed854892d81da00363a32a84c37fc9702d9 Mon Sep 17 00:00:00 2001 +From b9757a4f2a1d9c6e43d67ac5e6889da1e833852f Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Fri, 18 May 2018 20:15:34 +0200 -Subject: [PATCH 04/16] screen: Try harder to find a foreground process group +Subject: [PATCH 05/17] screen: Try harder to find a foreground process group member For pipelined commands, it's possible that the process group leader, @@ -453,17 +698,17 @@ long-running foreground process group terminates. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-screen.c | 30 +++++++++++++++++++++++++++++- + src/terminal-screen.cc | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 2ed7fdea8349..9b88cd986909 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -2337,7 +2337,35 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index c1cf61f1..e6b382f0 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -2347,7 +2347,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)) + if (!g_file_get_contents (filename, &data_buf, &len, nullptr)) - return TRUE; + { + int j; @@ -486,7 +731,7 @@ index 2ed7fdea8349..9b88cd986909 100644 + g_snprintf (filename, sizeof (filename), "/proc/%d/cmdline", (int) pid); + + g_clear_pointer (&data_buf, g_free); -+ if (g_file_get_contents (filename, &data_buf, &len, NULL)) ++ if (g_file_get_contents (filename, &data_buf, &len, nullptr)) + break; + } + @@ -498,13 +743,13 @@ index 2ed7fdea8349..9b88cd986909 100644 #endif -- -2.31.1 +2.32.0 -From 31c500155edbc893e79df97fbd5b291af2ed4f91 Mon Sep 17 00:00:00 2001 +From f0d2856d40d39092bed50f7a413e6ed69cabbcbb Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 3 May 2018 16:49:28 +0200 -Subject: [PATCH 05/16] screen: Track the current foreground process +Subject: [PATCH 06/17] screen: Track the current foreground process ... using the interactive shell's precmd and preexec hooks, by monitoring the contents of the terminal, and a combination of @@ -517,15 +762,15 @@ process. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-debug.c | 1 + - src/terminal-debug.h | 3 +- - src/terminal-screen.c | 148 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 151 insertions(+), 1 deletion(-) + src/terminal-debug.cc | 1 + + src/terminal-debug.hh | 3 +- + src/terminal-screen.cc | 150 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 153 insertions(+), 1 deletion(-) -diff --git a/src/terminal-debug.c b/src/terminal-debug.c -index d08829e93ff4..6d325b5aee9d 100644 ---- a/src/terminal-debug.c -+++ b/src/terminal-debug.c +diff --git a/src/terminal-debug.cc b/src/terminal-debug.cc +index 52acc70c..6324cbce 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 }, @@ -533,11 +778,11 @@ index d08829e93ff4..6d325b5aee9d 100644 + { "shell-command", TERMINAL_DEBUG_SHELL_COMMAND }, }; - _terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"), -diff --git a/src/terminal-debug.h b/src/terminal-debug.h -index 0fafcc3a846c..b0f2fc9df7f6 100644 ---- a/src/terminal-debug.h -+++ b/src/terminal-debug.h + _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 +--- 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, @@ -548,10 +793,10 @@ index 0fafcc3a846c..b0f2fc9df7f6 100644 } TerminalDebugFlags; void _terminal_debug_init(void); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 9b88cd986909..c66938271860 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index e6b382f0..8e3d2a85 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -108,6 +108,11 @@ struct _TerminalScreenPrivate gboolean exec_on_realize; guint idle_exec_source; @@ -587,8 +832,8 @@ index 9b88cd986909..c66938271860 100644 signals[PROFILE_SET] = g_signal_new (I_("profile-set"), -@@ -726,6 +740,18 @@ terminal_screen_dispose (GObject *object) - 0, 0, NULL, NULL, +@@ -732,6 +746,18 @@ terminal_screen_dispose (GObject *object) + 0, 0, nullptr, nullptr, screen); + if (priv->contents_changed_source_id != 0) @@ -606,7 +851,7 @@ index 9b88cd986909..c66938271860 100644 if (priv->idle_exec_source != 0) { g_source_remove (priv->idle_exec_source); -@@ -762,6 +788,7 @@ terminal_screen_finalize (GObject *object) +@@ -768,6 +794,7 @@ terminal_screen_finalize (GObject *object) g_slist_free_full (priv->match_tags, (GDestroyNotify) free_tag_data); g_free (priv->uuid); @@ -614,7 +859,7 @@ index 9b88cd986909..c66938271860 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1960,6 +1987,123 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -1970,6 +1997,125 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -622,21 +867,22 @@ index 9b88cd986909..c66938271860 100644 +terminal_screen_contents_changed_cb (TerminalScreen *screen) +{ + TerminalScreenPrivate *priv = screen->priv; -+ gs_free char *cmdline = NULL; ++ gs_free char *cmdline = nullptr; + + g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); + g_return_val_if_fail (priv->shell_preexec_source_id == 0, G_SOURCE_REMOVE); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Contents changed [timeout]\n"); + -+ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ if (!terminal_screen_has_foreground_process (screen, nullptr, &cmdline)) + goto out; + + if (g_strcmp0 (priv->current_cmdline, cmdline) == 0) + goto out; + + g_free (priv->current_cmdline); -+ priv->current_cmdline = g_steal_pointer (&cmdline); ++ priv->current_cmdline = cmdline; ++ cmdline = nullptr; + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + + out: @@ -697,17 +943,18 @@ index 9b88cd986909..c66938271860 100644 +{ + TerminalScreenPrivate *priv = screen->priv; + gboolean retval = G_SOURCE_CONTINUE; -+ gs_free char *cmdline = NULL; ++ gs_free char *cmdline = nullptr; + + g_return_val_if_fail (priv->between_preexec_and_precmd, G_SOURCE_REMOVE); -+ g_return_val_if_fail (priv->current_cmdline == NULL, G_SOURCE_REMOVE); ++ g_return_val_if_fail (priv->current_cmdline == nullptr, G_SOURCE_REMOVE); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell preexec [timeout]\n"); + -+ if (!terminal_screen_has_foreground_process (screen, NULL, &cmdline)) ++ if (!terminal_screen_has_foreground_process (screen, nullptr, &cmdline)) + goto out; + -+ priv->current_cmdline = g_steal_pointer (&cmdline); ++ priv->current_cmdline = cmdline; ++ cmdline = nullptr; + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: %s\n", priv->current_cmdline); + + priv->shell_preexec_source_id = 0; @@ -725,7 +972,7 @@ index 9b88cd986909..c66938271860 100644 + + g_return_if_fail (!priv->between_preexec_and_precmd); + g_return_if_fail (priv->contents_changed_source_id == 0); -+ g_return_if_fail (priv->current_cmdline == NULL); ++ g_return_if_fail (priv->current_cmdline == nullptr); + g_return_if_fail (priv->shell_preexec_source_id == 0); + + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell preexec\n"); @@ -738,7 +985,7 @@ index 9b88cd986909..c66938271860 100644 static void terminal_screen_drag_data_received (GtkWidget *widget, GdkDragContext *context, -@@ -2306,7 +2450,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, +@@ -2316,7 +2462,11 @@ terminal_screen_has_foreground_process (TerminalScreen *screen, if (fd == -1) return FALSE; @@ -751,13 +998,13 @@ index 9b88cd986909..c66938271860 100644 return FALSE; -- -2.31.1 +2.32.0 -From 800ac8908d3675b2e885edf2e972c0fa42d7ea51 Mon Sep 17 00:00:00 2001 +From 7d68c5aed8c198100e1b98ac4feb960e96221875 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 10 May 2018 19:23:16 +0200 -Subject: [PATCH 06/16] Notify when a long-running foreground process group +Subject: [PATCH 07/17] Notify when a long-running foreground process group terminates Notifications are only sent if the VteTerminal in which the process @@ -768,17 +1015,17 @@ notification is sent. https://bugzilla.gnome.org/show_bug.cgi?id=711059 --- - src/terminal-app.c | 32 ++++++++++++ - src/terminal-screen.c | 109 +++++++++++++++++++++++++++++++++++++++ - src/terminal-tab-label.c | 30 ++++++++++- - src/terminal-tab-label.h | 4 ++ + src/terminal-app.cc | 32 +++++++++++ + src/terminal-screen.cc | 109 ++++++++++++++++++++++++++++++++++++++ + src/terminal-tab-label.cc | 30 ++++++++++- + src/terminal-tab-label.hh | 4 ++ 4 files changed, 174 insertions(+), 1 deletion(-) -diff --git a/src/terminal-app.c b/src/terminal-app.c -index cf790fb44fc8..499011a8165a 100644 ---- a/src/terminal-app.c -+++ b/src/terminal-app.c -@@ -739,6 +739,31 @@ app_menu_quit_cb (GSimpleAction *action, +diff --git a/src/terminal-app.cc b/src/terminal-app.cc +index a06485cf..3eae3b29 100644 +--- a/src/terminal-app.cc ++++ b/src/terminal-app.cc +@@ -742,6 +742,31 @@ app_menu_quit_cb (GSimpleAction *action, gtk_widget_destroy (GTK_WIDGET (window)); } @@ -789,14 +1036,14 @@ index cf790fb44fc8..499011a8165a 100644 + GVariant *parameter, + gpointer user_data) +{ -+ GtkApplication *application = user_data; ++ GtkApplication *application = (GtkApplication*)user_data; + GtkWidget *toplevel; + TerminalScreen *screen; + const char *uuid; + + g_variant_get (parameter, "&s", &uuid); + screen = terminal_app_get_screen_by_uuid (TERMINAL_APP (application), uuid); -+ if (screen == NULL) ++ if (screen == nullptr) + return; + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (screen)); @@ -810,18 +1057,18 @@ index cf790fb44fc8..499011a8165a 100644 /* Class implementation */ G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION) -@@ -762,6 +787,10 @@ terminal_app_startup (GApplication *application) - { "quit", app_menu_quit_cb, NULL, NULL, NULL } +@@ -765,6 +790,10 @@ terminal_app_startup (GApplication *application) + { "quit", app_menu_quit_cb, nullptr, nullptr, nullptr } }; + const GActionEntry other_actions[] = { -+ { "activate-tab", action_activate_tab_cb, "s", NULL, NULL } ++ { "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); -@@ -772,6 +801,9 @@ terminal_app_startup (GApplication *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); @@ -831,18 +1078,18 @@ index cf790fb44fc8..499011a8165a 100644 app_load_css (application); -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index c66938271860..a335713d0f8d 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 8e3d2a85..0c747b24 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -55,6 +55,7 @@ #include "terminal-marshal.h" - #include "terminal-schemas.h" - #include "terminal-screen-container.h" -+#include "terminal-tab-label.h" - #include "terminal-util.h" - #include "terminal-window.h" - #include "terminal-info-bar.h" + #include "terminal-schemas.hh" + #include "terminal-screen-container.hh" ++#include "terminal-tab-label.hh" + #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 *, static gboolean terminal_screen_popup_menu (GtkWidget *widget); static gboolean terminal_screen_button_press (GtkWidget *widget, @@ -862,7 +1109,7 @@ index c66938271860..a335713d0f8d 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; -@@ -729,6 +735,10 @@ terminal_screen_dispose (GObject *object) +@@ -735,6 +741,10 @@ terminal_screen_dispose (GObject *object) TerminalScreen *screen = TERMINAL_SCREEN (object); TerminalScreenPrivate *priv = screen->priv; GtkSettings *settings; @@ -873,7 +1120,7 @@ index c66938271860..a335713d0f8d 100644 /* Unset child PID so that when an eventual child-exited signal arrives, * we don't emit "close". -@@ -1891,6 +1901,45 @@ terminal_screen_button_press (GtkWidget *widget, +@@ -1901,6 +1911,45 @@ terminal_screen_button_press (GtkWidget *widget, return FALSE; } @@ -888,12 +1135,12 @@ index c66938271860..a335713d0f8d 100644 + _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Notification withdrawn\n"); + + window = terminal_screen_get_window (screen); -+ if (window != NULL) ++ if (window != nullptr) + { + TerminalScreenContainer *screen_container; + + screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container != NULL) ++ if (screen_container != nullptr) + { + GtkWidget *mdi_container; + @@ -905,7 +1152,7 @@ index c66938271860..a335713d0f8d 100644 + + tab_label = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mdi_container), GTK_WIDGET (screen_container)); + terminal_tab_label_set_bold (TERMINAL_TAB_LABEL (tab_label), FALSE); -+ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), NULL, NULL); ++ terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), nullptr, nullptr); + } + } + } @@ -919,7 +1166,7 @@ index c66938271860..a335713d0f8d 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -2035,6 +2084,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) +@@ -2046,6 +2095,63 @@ terminal_screen_contents_changed (VteTerminal *terminal) screen); } @@ -930,7 +1177,7 @@ index c66938271860..a335713d0f8d 100644 + TerminalWindow *window; + + window = terminal_screen_get_window (screen); -+ if (window == NULL) ++ if (window == nullptr) + return; + + if (gtk_window_is_active (GTK_WINDOW (window))) @@ -942,7 +1189,7 @@ index c66938271860..a335713d0f8d 100644 + return; + + screen_container = terminal_screen_container_get_from_screen (screen); -+ if (screen_container == NULL) ++ if (screen_container == nullptr) + return; + + mdi_container = terminal_window_get_mdi_container (window); @@ -961,10 +1208,10 @@ index c66938271860..a335713d0f8d 100644 + } + else + { -+ gs_unref_object GNotification *notification = NULL; ++ gs_unref_object GNotification *notification = nullptr; + TerminalApp *app; -+ gs_free char *current_cmdline_valid = NULL; -+ gs_free char *detailed_action = NULL; ++ gs_free char *current_cmdline_valid = nullptr; ++ gs_free char *detailed_action = nullptr; + + notification = g_notification_new (_("Command completed")); + @@ -983,20 +1230,20 @@ index c66938271860..a335713d0f8d 100644 static void terminal_screen_shell_precmd (VteTerminal *terminal) { -@@ -2057,6 +2163,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2068,6 +2174,9 @@ terminal_screen_shell_precmd (VteTerminal *terminal) priv->shell_preexec_source_id = 0; } -+ if (priv->current_cmdline != NULL) ++ if (priv->current_cmdline != nullptr) + terminal_screen_show_notification (screen); + g_clear_pointer (&priv->current_cmdline, g_free); _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Current foreground command-line: (none)\n"); } -diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c -index 7b4b0849ad8d..4fd0af13484a 100644 ---- a/src/terminal-tab-label.c -+++ b/src/terminal-tab-label.c +diff --git a/src/terminal-tab-label.cc b/src/terminal-tab-label.cc +index 88af5d41..d6423f11 100644 +--- a/src/terminal-tab-label.cc ++++ b/src/terminal-tab-label.cc @@ -34,6 +34,7 @@ struct _TerminalTabLabelPrivate { @@ -1022,10 +1269,10 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + gtk_widget_set_no_show_all (icon, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + - priv->label = label = gtk_label_new (NULL); + priv->label = label = gtk_label_new (nullptr); gtk_widget_set_halign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); -@@ -376,6 +381,29 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, +@@ -380,6 +385,29 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label, pango_attr_list_unref (attr_list); } @@ -1036,7 +1283,7 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + * @tooltip: (allow-none): text to be used as tooltip + * + * Shows an icon at the beginning of @tab_label. If @icon_name is -+ * %NULL, then the icon will be hidden. ++ * %nullptr, then the icon will be hidden. + */ +void +terminal_tab_label_set_icon (TerminalTabLabel *tab_label, @@ -1047,7 +1294,7 @@ index 7b4b0849ad8d..4fd0af13484a 100644 + + g_return_if_fail (TERMINAL_IS_TAB_LABEL (tab_label)); + -+ gtk_widget_set_visible (priv->icon, icon_name != NULL); ++ gtk_widget_set_visible (priv->icon, icon_name != nullptr); + gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), icon_name, GTK_ICON_SIZE_MENU); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->icon), tooltip); +} @@ -1055,10 +1302,10 @@ index 7b4b0849ad8d..4fd0af13484a 100644 /** * terminal_tab_label_get_screen: * @tab_label: a #TerminalTabLabel -diff --git a/src/terminal-tab-label.h b/src/terminal-tab-label.h -index 20cfbceb36b0..a987025e0524 100644 ---- a/src/terminal-tab-label.h -+++ b/src/terminal-tab-label.h +diff --git a/src/terminal-tab-label.hh b/src/terminal-tab-label.hh +index 91b7e617..37e808a7 100644 +--- a/src/terminal-tab-label.hh ++++ b/src/terminal-tab-label.hh @@ -59,6 +59,10 @@ GtkWidget * terminal_tab_label_new (TerminalScreen *screen); void terminal_tab_label_set_bold (TerminalTabLabel *tab_label, gboolean bold); @@ -1071,13 +1318,13 @@ index 20cfbceb36b0..a987025e0524 100644 G_END_DECLS -- -2.31.1 +2.32.0 -From 91d3a2c296febe824b4143f878965a0f9397238f Mon Sep 17 00:00:00 2001 +From 715742991a70a772efecb784ec1fa0fa8bbd2347 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Tue, 10 Apr 2018 15:39:35 +0200 -Subject: [PATCH 07/16] profile: Split the Command tab into two nested GtkGrids +Subject: [PATCH 08/17] profile: Split the Command tab into two nested GtkGrids This will let the subsequent patch add a "Command" sub-heading to keep the command settings separate from the to-be-restored title settings. @@ -1088,7 +1335,7 @@ 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 64f8295bf2b0..426993a4e154 100644 +index 64f8295b..426993a4 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1965,130 +1965,137 @@ @@ -1346,13 +1593,13 @@ index 64f8295bf2b0..426993a4e154 100644 </object> <packing> -- -2.31.1 +2.32.0 -From 81dc06bd563af0b3391a71e70b4604a11461caa5 Mon Sep 17 00:00:00 2001 +From 28759a83bbbdf3143f8925ca63078e1c5e63fa4f Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Tue, 10 Apr 2018 16:01:51 +0200 -Subject: [PATCH 08/16] Revert "profile: Remove the "Command" sub-heading" +Subject: [PATCH 09/17] Revert "profile: Remove the "Command" sub-heading" This reverts commit 8e27479299d075df0a52d0e8e7baeab344dcaa6c. @@ -1362,7 +1609,7 @@ 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 426993a4e154..7f4a94c88b6b 100644 +index 426993a4..7f4a94c8 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1973,129 +1973,168 @@ @@ -1639,27 +1886,27 @@ index 426993a4e154..7f4a94c88b6b 100644 </object> <packing> -- -2.31.1 +2.32.0 -From ee98a681f6a6281672ba02e90efb472ff6d273a4 Mon Sep 17 00:00:00 2001 +From 149c9ebc4f5675969ffce6ee04b81553a3b60f34 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 30 Jun 2016 16:02:13 +0200 -Subject: [PATCH 09/16] Revert "screen: Remove unused description and +Subject: [PATCH 10/17] Revert "screen: Remove unused description and user_title API" This reverts commit 3bb41272b7509a16ec2a5cd93e44f73d5743b626. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/terminal-screen.c | 63 +++++++++++++++++++++++++++++++++++++++++++ - src/terminal-screen.h | 5 ++++ - 2 files changed, 68 insertions(+) + src/terminal-screen.cc | 64 ++++++++++++++++++++++++++++++++++++++++++ + src/terminal-screen.hh | 5 ++++ + 2 files changed, 69 insertions(+) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index a335713d0f8d..7f237b3b46b7 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 0c747b24..bcdb19ce 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -112,6 +112,7 @@ struct _TerminalScreenPrivate gboolean between_preexec_and_precmd; @@ -1687,28 +1934,29 @@ index a335713d0f8d..7f237b3b46b7 100644 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -614,6 +619,7 @@ terminal_screen_set_property (GObject *object, - terminal_screen_set_profile (screen, g_value_get_object (value)); + terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: + case PROP_DESCRIPTION: /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -703,6 +709,13 @@ terminal_screen_class_init (TerminalScreenClass *klass) - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - -+ g_object_class_install_property (object_class, -+ PROP_DESCRIPTION, -+ g_param_spec_string ("description", NULL, NULL, -+ NULL, -+ G_PARAM_READABLE | -+ G_PARAM_STATIC_STRINGS)); +@@ -709,6 +715,14 @@ terminal_screen_class_init (TerminalScreenClass *klass) + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB))); + ++ g_object_class_install_property ++ (object_class, ++ PROP_DESCRIPTION, ++ g_param_spec_string ("description", nullptr, nullptr, ++ nullptr, ++ GParamFlags(G_PARAM_READABLE | ++ G_PARAM_STATIC_STRINGS))); + g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -799,6 +812,7 @@ terminal_screen_finalize (GObject *object) +@@ -805,6 +819,7 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -1716,7 +1964,7 @@ index a335713d0f8d..7f237b3b46b7 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -1056,6 +1070,21 @@ terminal_screen_get_title (TerminalScreen *screen) +@@ -1063,6 +1078,21 @@ terminal_screen_get_title (TerminalScreen *screen) return vte_terminal_get_window_title (VTE_TERMINAL (screen)); } @@ -1738,7 +1986,7 @@ index a335713d0f8d..7f237b3b46b7 100644 static void terminal_screen_profile_changed_cb (GSettings *profile, const char *prop_name, -@@ -1384,6 +1413,7 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1391,6 +1421,7 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -1746,7 +1994,7 @@ index a335713d0f8d..7f237b3b46b7 100644 } GSettings* -@@ -1650,6 +1680,8 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1659,6 +1690,8 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -1754,8 +2002,8 @@ index a335713d0f8d..7f237b3b46b7 100644 + if (error) { // FIXMEchpe should be unnecessary, vte already does this internally - vte_terminal_set_pty (terminal, NULL); -@@ -1940,6 +1972,35 @@ terminal_screen_focus_in (GtkWidget *widget, + vte_terminal_set_pty (terminal, nullptr); +@@ -1950,6 +1983,35 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -1771,7 +2019,7 @@ index a335713d0f8d..7f237b3b46b7 100644 + return; + + g_free (priv->title); -+ priv->title = title && title[0] ? g_strdup (title) : NULL; ++ priv->title = title && title[0] ? g_strdup (title) : nullptr; + + g_object_notify (G_OBJECT (screen), "description"); +} @@ -1781,7 +2029,7 @@ index a335713d0f8d..7f237b3b46b7 100644 +{ + TerminalScreenPrivate *priv; + -+ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); ++ g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr); + + priv = screen->priv; + @@ -1791,19 +2039,19 @@ index a335713d0f8d..7f237b3b46b7 100644 /** * terminal_screen_get_current_dir: * @screen: -@@ -1993,6 +2054,8 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2003,6 +2065,8 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; + g_object_notify (G_OBJECT (screen), "description"); + - action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); + action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); switch (action) -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index df59b1a58273..9a9a562a9d84 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index df59b1a5..9a9a562a 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -113,7 +113,12 @@ void terminal_screen_set_profile (TerminalScreen *screen, GSettings* terminal_screen_get_profile (TerminalScreen *screen); GSettings* terminal_screen_ref_profile (TerminalScreen *screen); @@ -1818,13 +2066,13 @@ index df59b1a58273..9a9a562a9d84 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); -- -2.31.1 +2.32.0 -From 3596c195e594caff9370392a181e001ab1106be2 Mon Sep 17 00:00:00 2001 +From 9dd8a0a60572fe92adca8e1fd4348e1882f5a1c1 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 30 Jun 2016 17:39:48 +0200 -Subject: [PATCH 10/16] Revert "Remove the static title setting from profile +Subject: [PATCH 11/17] Revert "Remove the static title setting from profile preferences" This reverts commit e9cb8fea14a849704074c5d69f173bcf4dc2fb27. @@ -1833,13 +2081,13 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 5 +++ src/preferences.ui | 71 ++++++++++++++++++++++++++++++ - src/profile-editor.c | 5 +++ - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 9 ++++ - 5 files changed, 91 insertions(+) + src/profile-editor.cc | 6 +++ + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 9 ++++ + 5 files changed, 92 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index b6c42ec62a16..3ef53b8b40b8 100644 +index b6c42ec6..3ef53b8b 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -209,6 +209,11 @@ @@ -1855,7 +2103,7 @@ index b6c42ec62a16..3ef53b8b40b8 100644 <default>false</default> <summary>Whether bold is also bright</summary> diff --git a/src/preferences.ui b/src/preferences.ui -index 7f4a94c88b6b..f86f8c980f89 100644 +index 7f4a94c8..f86f8c98 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -1966,6 +1966,77 @@ @@ -1936,26 +2184,27 @@ index 7f4a94c88b6b..f86f8c980f89 100644 <child> <object class="GtkGrid"> <property name="visible">True</property> -diff --git a/src/profile-editor.c b/src/profile-editor.c -index 35bd24791417..df1f219608c4 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1368,6 +1368,11 @@ profile_prefs_load (const char *uuid, GSettings *profile) +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index 3d50524d..1a4ab30d 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1417,6 +1417,12 @@ profile_prefs_load (const char *uuid, GSettings *profile) (GSettingsBindSetMapping) enum_to_string, - terminal_preserve_working_directory_get_type, NULL); + terminal_preserve_working_directory_get_type, nullptr); + profile_prefs_settings_bind (profile, + TERMINAL_PROFILE_TITLE_KEY, + gtk_builder_get_object (builder, "title-entry"), + "text", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET)); profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY, gtk_builder_get_object (builder, "use-custom-command-checkbutton"), -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index d2917fac37f2..16e5c3264725 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index d2917fac..16e5c326 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh @@ -71,6 +71,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" @@ -1964,15 +2213,15 @@ index d2917fac37f2..16e5c3264725 100644 #define TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY "use-custom-command" #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 7f237b3b46b7..a3386dac16b5 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -1074,11 +1074,14 @@ char * +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index bcdb19ce..f8650501 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -1082,11 +1082,14 @@ char * terminal_screen_get_description (TerminalScreen *screen) { TerminalScreenPrivate *priv = screen->priv; -+ gs_free char *title_string = NULL; ++ gs_free char *title_string = nullptr; const char *title; /* use --title argument if one was supplied, otherwise ask the profile */ @@ -1983,8 +2232,8 @@ index 7f237b3b46b7..a3386dac16b5 100644 return g_strdup_printf ("%s — %d", title && title[0] ? title : _("Terminal"), -@@ -1124,6 +1127,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, - vte_terminal_set_cjk_ambiguous_width (vte_terminal, (int) width); +@@ -1132,6 +1135,12 @@ terminal_screen_profile_changed_cb (GSettings *profile, + vte_terminal_set_cjk_ambiguous_width (vte_terminal, width); } + if (!prop_name || @@ -1997,13 +2246,13 @@ index 7f237b3b46b7..a3386dac16b5 100644 (!prop_name || prop_name == I_(TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY) || -- -2.31.1 +2.32.0 -From ffd0ffa95467e538413f0410597174e3c0233692 Mon Sep 17 00:00:00 2001 +From 22c8810a732244a588dc733cdeaf3fabf477a5cb Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Tue, 17 Feb 2015 17:06:17 +0100 -Subject: [PATCH 11/16] Restore translations for setting a title and +Subject: [PATCH 12/17] Restore translations for setting a title and transparency --- @@ -2022,7 +2271,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and po/bs.po | 10 ++++++++++ po/ca.po | 12 ++++++++++++ po/ca(a)valencia.po | 12 ++++++++++++ - po/cs.po | 12 ++++++++++++ + po/cs.po | 11 +++++++++++ po/cy.po | 8 ++++---- po/da.po | 12 ++++++++++++ po/de.po | 12 ++++++++++++ @@ -2037,7 +2286,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and po/eu.po | 12 ++++++++++++ po/fa.po | 15 +++++++++------ po/fi.po | 12 ++++++++++++ - po/fr.po | 12 ++++++++++++ + po/fr.po | 24 ++++++++++++++++++++++++ po/fur.po | 11 +++++++++-- po/ga.po | 3 +++ po/gl.po | 12 ++++++++++++ @@ -2075,7 +2324,7 @@ Subject: [PATCH 11/16] Restore translations for setting a title and po/pa.po | 23 +++++++++++------------ po/ps.po | 8 ++++---- po/pt.po | 16 ++++++++-------- - po/pt_BR.po | 15 +++++++++------ + po/pt_BR.po | 12 ++++++++++++ po/ro.po | 4 ++-- po/ru.po | 16 ++++++++++++++++ po/rw.po | 3 +-- @@ -2099,10 +2348,10 @@ Subject: [PATCH 11/16] Restore translations for setting a title and po/zh_CN.po | 15 +++++++++------ po/zh_HK.po | 15 +++++++++------ po/zh_TW.po | 15 +++++++++------ - 92 files changed, 720 insertions(+), 341 deletions(-) + 92 files changed, 734 insertions(+), 335 deletions(-) diff --git a/po/am.po b/po/am.po -index 3445d96da657..ee992f0712a5 100644 +index 3445d96d..ee992f07 100644 --- a/po/am.po +++ b/po/am.po @@ -214,8 +214,8 @@ msgid "Background" @@ -2128,7 +2377,7 @@ index 3445d96da657..ee992f0712a5 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/an.po b/po/an.po -index fcec2668aa11..9e07cb682c57 100644 +index fcec2668..9e07cb68 100644 --- a/po/an.po +++ b/po/an.po @@ -2241,8 +2241,8 @@ msgstr "_Zarrar a finestra" @@ -2165,7 +2414,7 @@ index fcec2668aa11..9e07cb682c57 100644 #~ msgid "Keyboard Shortcuts" #~ msgstr "Alcorces de teclau" diff --git a/po/ar.po b/po/ar.po -index fac62fd10680..f77804d8aec4 100644 +index fac62fd1..f77804d8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2574,11 +2574,11 @@ msgstr "أغ_لق النافذة" @@ -2207,7 +2456,7 @@ index fac62fd10680..f77804d8aec4 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "_ظلل شفافية أو صورة الخلفية:" diff --git a/po/as.po b/po/as.po -index 3fade2b8cb12..5b905340f89f 100644 +index 3fade2b8..5b905340 100644 --- a/po/as.po +++ b/po/as.po @@ -2163,11 +2163,11 @@ msgstr "উইন্ডো বন্ধ কৰক (_l)" @@ -2249,7 +2498,7 @@ index 3fade2b8cb12..5b905340f89f 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "স্বচ্ছ বা ছবিৰ সৈতে পটভূমি ছায়া আচ্ছন্ন কৰক (_h):" diff --git a/po/ast.po b/po/ast.po -index d1c6e7b8174a..4dc0892ed9c4 100644 +index d1c6e7b8..4dc0892e 100644 --- a/po/ast.po +++ b/po/ast.po @@ -1304,8 +1304,8 @@ msgid "_Base on:" @@ -2275,7 +2524,7 @@ index d1c6e7b8174a..4dc0892ed9c4 100644 #: ../src/profile-preferences.glade.h:78 msgid "_Underline color:" diff --git a/po/az.po b/po/az.po -index 586c1e4d827b..4bd846797101 100644 +index 586c1e4d..4bd84679 100644 --- a/po/az.po +++ b/po/az.po @@ -218,8 +218,8 @@ msgid "Background" @@ -2301,7 +2550,7 @@ index 586c1e4d827b..4bd846797101 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/be.po b/po/be.po -index 298ec2d6ae0c..50f46093a712 100644 +index 298ec2d6..50f46093 100644 --- a/po/be.po +++ b/po/be.po @@ -2635,3 +2635,6 @@ msgstr "_Закрыць акно" @@ -2312,7 +2561,7 @@ index 298ec2d6ae0c..50f46093a712 100644 +msgid "Transparent background" +msgstr "Празрысты фон" diff --git a/po/be(a)latin.po b/po/be(a)latin.po -index 82ef0664ae1e..27e9877f96e8 100644 +index 82ef0664..27e9877f 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1146,8 +1146,8 @@ msgid "_Base on:" @@ -2338,13 +2587,13 @@ index 82ef0664ae1e..27e9877f96e8 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/bg.po b/po/bg.po -index 9a4f32e4b135..6ac17c17efb8 100644 +index 554f1dc6..b63c2211 100644 --- a/po/bg.po +++ b/po/bg.po -@@ -2305,3 +2305,12 @@ msgstr "" - #: ../src/terminal-window.c:3953 - msgid "C_lose Window" - msgstr "_Затваряне на този прозорец" +@@ -2448,3 +2448,12 @@ msgstr "_Затваряне на този прозорец" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Аргументите не могат да бъдат анализирани: %s\n" + +msgid "Transparent background" +msgstr "Прозрачен фон" @@ -2355,7 +2604,7 @@ index 9a4f32e4b135..6ac17c17efb8 100644 +msgid "Set Title" +msgstr "Задаване на заглавие" diff --git a/po/bn.po b/po/bn.po -index 4906009cf46f..f97d43b0e515 100644 +index 4906009c..f97d43b0 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1217,8 +1217,8 @@ msgid "_Base on:" @@ -2381,7 +2630,7 @@ index 4906009cf46f..f97d43b0e515 100644 #: ../src/profile-preferences.glade.h:77 msgid "_Unlimited" diff --git a/po/bn_IN.po b/po/bn_IN.po -index 96f28aae6b4f..fdd0ef726900 100644 +index 96f28aae..fdd0ef72 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -2894,8 +2894,8 @@ msgstr "উইন্ডো বন্ধ করুন (_l)" @@ -2407,7 +2656,7 @@ index 96f28aae6b4f..fdd0ef726900 100644 +msgid "Transparent background" +msgstr "স্বচ্চ পটভূমি " diff --git a/po/br.po b/po/br.po -index e16ea07dfc21..f4cbe857d5ca 100644 +index e16ea07d..f4cbe857 100644 --- a/po/br.po +++ b/po/br.po @@ -958,8 +958,8 @@ msgid "_Base on:" @@ -2431,7 +2680,7 @@ index e16ea07dfc21..f4cbe857d5ca 100644 #: ../src/profile-preferences.glade.h:74 diff --git a/po/bs.po b/po/bs.po -index 49e710859ac9..8703552984b1 100644 +index 49e71085..87035529 100644 --- a/po/bs.po +++ b/po/bs.po @@ -680,6 +680,10 @@ msgstr "Kratica tastature za povećavanje fonta" @@ -2456,10 +2705,10 @@ index 49e710859ac9..8703552984b1 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/ca.po b/po/ca.po -index 1b8caf793161..aa72341a63de 100644 +index 639b1123..be42e1f5 100644 --- a/po/ca.po +++ b/po/ca.po -@@ -2499,3 +2499,15 @@ msgstr "Tanca la _finestra" +@@ -2512,3 +2512,15 @@ msgstr "Ha fallat l'anàlisi dels arguments: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Separa la pestanya" @@ -2476,7 +2725,7 @@ index 1b8caf793161..aa72341a63de 100644 +msgid "Set Title" +msgstr "Estableix el títol" diff --git a/po/ca(a)valencia.po b/po/ca(a)valencia.po -index a6e8fb4250dc..c9ed8508228d 100644 +index a6e8fb42..c9ed8508 100644 --- a/po/ca(a)valencia.po +++ b/po/ca(a)valencia.po @@ -2357,3 +2357,15 @@ msgstr "Tanca la _finestra" @@ -2496,14 +2745,13 @@ index a6e8fb4250dc..c9ed8508228d 100644 +msgid "Set Title" +msgstr "Estableix el títol" diff --git a/po/cs.po b/po/cs.po -index c0bc3c860d28..921ca214e6fe 100644 +index 5a4d02a4..6e46af21 100644 --- a/po/cs.po +++ b/po/cs.po -@@ -2432,3 +2432,15 @@ msgstr "" - #: src/terminal-window.c:3242 - msgid "C_lose Window" - msgstr "_Zavřít okno" -+ +@@ -2378,3 +2378,14 @@ msgstr "_Zavřít okno" + msgid "Failed to parse arguments: %s\n" + msgstr "Selhala analýza argumentů: %s\n" + +msgid "Transparent background" +msgstr "Průsvitné pozadí" + @@ -2516,7 +2764,7 @@ index c0bc3c860d28..921ca214e6fe 100644 +msgid "Set Title" +msgstr "Nastavit záhlaví" diff --git a/po/cy.po b/po/cy.po -index 644df82363f1..cd862feb50c0 100644 +index 644df823..cd862feb 100644 --- a/po/cy.po +++ b/po/cy.po @@ -1167,8 +1167,8 @@ msgid "_Base on:" @@ -2542,10 +2790,10 @@ index 644df82363f1..cd862feb50c0 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/da.po b/po/da.po -index eb21daa279ef..edebccb48e90 100644 +index 8ca75914..a27a354f 100644 --- a/po/da.po +++ b/po/da.po -@@ -2459,3 +2459,15 @@ msgstr "_Luk vindue" +@@ -2488,3 +2488,15 @@ msgstr "Kunne ikke fortolke argumenter: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Løsriv faneblad" @@ -2562,10 +2810,10 @@ index eb21daa279ef..edebccb48e90 100644 +msgid "Transparent background" +msgstr "Gennemsigtig baggrund" diff --git a/po/de.po b/po/de.po -index bb317019dd78..7969515945a7 100644 +index 1f3b75d4..c2dce072 100644 --- a/po/de.po +++ b/po/de.po -@@ -2550,3 +2550,15 @@ msgstr "Fenster _schließen" +@@ -2571,3 +2571,15 @@ msgstr "Einlesen der Argumente schlug fehl: %s\n" #~ msgid "_Quit" #~ msgstr "_Beenden" @@ -2582,7 +2830,7 @@ index bb317019dd78..7969515945a7 100644 +msgid "Transparent background" +msgstr "Transparenter Hintergrund" diff --git a/po/dz.po b/po/dz.po -index d97e6102b850..a768fe4adc54 100644 +index d97e6102..a768fe4a 100644 --- a/po/dz.po +++ b/po/dz.po @@ -1255,8 +1255,8 @@ msgid "_Base on:" @@ -2608,10 +2856,10 @@ index d97e6102b850..a768fe4adc54 100644 #: ../src/profile-preferences.glade.h:78 #, fuzzy diff --git a/po/el.po b/po/el.po -index 0b489324247f..4a1d02727c5b 100644 +index a82659e6..d814147c 100644 --- a/po/el.po +++ b/po/el.po -@@ -2895,17 +2895,17 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2915,17 +2915,17 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" #~ msgid "Default size:" #~ msgstr "Προεπιλεγμένο μέγεθος:" @@ -2635,7 +2883,7 @@ index 0b489324247f..4a1d02727c5b 100644 #~ msgid "Current Locale" #~ msgstr "Τρέχουσα τοπική ρύθμιση" -@@ -2943,3 +2943,6 @@ msgstr "Κ_λείσιμο παραθύρου" +@@ -2963,3 +2963,6 @@ msgstr "Αποτυχία ανάλυσης των ορισμάτων: %s\n" #~ msgid "_Input Methods" #~ msgstr "_Μέθοδοι εισαγωγής" @@ -2643,7 +2891,7 @@ index 0b489324247f..4a1d02727c5b 100644 +msgid "Transparent background" +msgstr "Διάφανο παρασκήνιο" diff --git a/po/en(a)shaw.po b/po/en(a)shaw.po -index 5bdb39250e53..6fb8a7e1c3bb 100644 +index 5bdb3925..6fb8a7e1 100644 --- a/po/en(a)shaw.po +++ b/po/en(a)shaw.po @@ -1212,8 +1212,8 @@ msgid "_Base on:" @@ -2669,7 +2917,7 @@ index 5bdb39250e53..6fb8a7e1c3bb 100644 #: ../src/profile-preferences.glade.h:79 msgid "_Underline color:" diff --git a/po/en_CA.po b/po/en_CA.po -index 6c9e0cd73d63..db4aa891dd45 100644 +index 6c9e0cd7..db4aa891 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -219,8 +219,8 @@ msgid "Background" @@ -2695,10 +2943,10 @@ index 6c9e0cd73d63..db4aa891dd45 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/en_GB.po b/po/en_GB.po -index efa4f808efa5..8d6a061aa3f2 100644 +index 2d112348..675cdb3d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po -@@ -2837,8 +2837,8 @@ msgstr "C_lose Window" +@@ -2858,8 +2858,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Default size:" #~ msgstr "Default size:" @@ -2709,7 +2957,7 @@ index efa4f808efa5..8d6a061aa3f2 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "When terminal commands set their o_wn titles:" -@@ -2855,8 +2855,8 @@ msgstr "C_lose Window" +@@ -2876,8 +2876,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Unlimited" @@ -2720,7 +2968,7 @@ index efa4f808efa5..8d6a061aa3f2 100644 #~ msgid "Switch to Tab 3" #~ msgstr "Switch to Tab 3" -@@ -2897,8 +2897,8 @@ msgstr "C_lose Window" +@@ -2918,8 +2918,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Input Methods" #~ msgstr "_Input Methods" @@ -2731,7 +2979,7 @@ index efa4f808efa5..8d6a061aa3f2 100644 #~ msgid "Add or Remove Terminal Encodings" #~ msgstr "Add or Remove Terminal Encodings" -@@ -3593,8 +3593,8 @@ msgstr "C_lose Window" +@@ -3614,8 +3614,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Background image _scrolls" #~ msgstr "Background image _scrolls" @@ -2743,7 +2991,7 @@ index efa4f808efa5..8d6a061aa3f2 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 0e83b981753b..0d98ea57c90a 100644 +index 0e83b981..0d98ea57 100644 --- a/po/eo.po +++ b/po/eo.po @@ -2827,8 +2827,8 @@ msgstr "_Fermi la fenestron" @@ -2769,10 +3017,10 @@ index 0e83b981753b..0d98ea57c90a 100644 #~ msgid "On the left side" #~ msgstr "Maldekstre" diff --git a/po/es.po b/po/es.po -index c9062a63c5f9..8d4ade9c2a95 100644 +index 98e99bf3..c7ba421e 100644 --- a/po/es.po +++ b/po/es.po -@@ -2900,17 +2900,17 @@ msgstr "_Cerrar ventana" +@@ -2921,17 +2921,17 @@ msgstr "Falló al analizar los argumentos: %s\n" #~ msgid "Default size:" #~ msgstr "Tamaño predeterminado:" @@ -2796,7 +3044,7 @@ index c9062a63c5f9..8d4ade9c2a95 100644 #~ msgid "Current Locale" #~ msgstr "Configuración regional actual" -@@ -3736,8 +3736,8 @@ msgstr "_Cerrar ventana" +@@ -3757,8 +3757,8 @@ msgstr "Falló al analizar los argumentos: %s\n" #~ msgid "_Solid color" #~ msgstr "Color _sólido" @@ -2808,7 +3056,7 @@ index c9062a63c5f9..8d4ade9c2a95 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "No existe el perfil «%s», usando el perfil predeterminado\n" diff --git a/po/et.po b/po/et.po -index 4b1c2a7c67e4..770761168806 100644 +index 4b1c2a7c..77076116 100644 --- a/po/et.po +++ b/po/et.po @@ -1747,3 +1747,6 @@ msgstr "Su_lge aken" @@ -2819,10 +3067,10 @@ index 4b1c2a7c67e4..770761168806 100644 +msgid "Transparent background" +msgstr "Läbipaistev taust" diff --git a/po/eu.po b/po/eu.po -index ae95cb3eff48..051daa0cf120 100644 +index 6e014314..16f485b4 100644 --- a/po/eu.po +++ b/po/eu.po -@@ -2342,3 +2342,15 @@ msgstr "It_xi leihoa" +@@ -2362,3 +2362,15 @@ msgstr "Huts egin du argumentuak analizatzean: %s\n" #~ msgid "_Detach Tab" #~ msgstr "_Desuztartu fitxa" @@ -2839,10 +3087,10 @@ index ae95cb3eff48..051daa0cf120 100644 +msgid "Transparent background" +msgstr "Atzeko plano gardena" diff --git a/po/fa.po b/po/fa.po -index 92ab653ec9fc..f4e92488905a 100644 +index 70ffa07d..8b746710 100644 --- a/po/fa.po +++ b/po/fa.po -@@ -2782,8 +2782,8 @@ msgstr "_بستن پنجره" +@@ -2793,8 +2793,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "Use custom default terminal si_ze" #~ msgstr "استفاده از اندازه‌ی _سفارشی پایانه‌ی پیش‌فرض" @@ -2853,7 +3101,7 @@ index 92ab653ec9fc..f4e92488905a 100644 #~ msgid "When terminal commands set their o_wn titles:" #~ msgstr "وقتی که فرمان‌های پایانه عنوان‌های _خودشان را تنظیم می‌کنند:" -@@ -2797,8 +2797,8 @@ msgstr "_بستن پنجره" +@@ -2808,8 +2808,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "_Unlimited" #~ msgstr "_نامحدود" @@ -2864,7 +3112,7 @@ index 92ab653ec9fc..f4e92488905a 100644 #~ msgid "Switch to Tab 3" #~ msgstr "تعویض به زبانه‌ی ۳" -@@ -2839,5 +2839,8 @@ msgstr "_بستن پنجره" +@@ -2850,5 +2850,8 @@ msgstr "تجزیهٔ آرگومان‌ها ممکن نبود: %s\n" #~ msgid "_Input Methods" #~ msgstr "روش‌های _ورودی" @@ -2876,10 +3124,10 @@ index 92ab653ec9fc..f4e92488905a 100644 +msgid "Transparent background" +msgstr "پس‌زمینه‌ی شفاف" diff --git a/po/fi.po b/po/fi.po -index 71388411b190..c38d9f964c2d 100644 +index 28f05dbd..ba5995c9 100644 --- a/po/fi.po +++ b/po/fi.po -@@ -2758,9 +2758,21 @@ msgstr "_Sulje ikkuna" +@@ -2782,9 +2782,21 @@ msgstr "Virhe tulkittaessa argumentteja: %s\n" #~ msgid "_Update login records when command is launched" #~ msgstr "_Päivitä kirjautumistallenne kun komento käynnistetään" @@ -2902,13 +3150,25 @@ index 71388411b190..c38d9f964c2d 100644 +msgid "Set Title" +msgstr "Aseta otsikko" diff --git a/po/fr.po b/po/fr.po -index 69f634ec3bb5..8e17f9875e55 100644 +index 3a9ee71e..64d56414 100644 --- a/po/fr.po +++ b/po/fr.po -@@ -2525,3 +2525,15 @@ msgstr "Fermer _la fenêtre" +@@ -2533,3 +2533,27 @@ msgstr "Impossible d’analyser les paramètres : %s\n" - #~ msgid "_Detach Tab" - #~ msgstr "_Détacher l’onglet" + #~ msgid "Icelandic" + #~ msgstr "Islandais" ++ ++#~ msgid "Set _Character Encoding" ++#~ msgstr "_Définir le codage des caractères" ++ ++#~ msgid "Move Tab _Left" ++#~ msgstr "Déplacer l’onglet vers la _gauche" ++ ++#~ msgid "Move Tab _Right" ++#~ msgstr "Déplacer l’onglet vers la _droite" ++ ++#~ msgid "_Detach Tab" ++#~ msgstr "_Détacher l’onglet" + +msgid "Transparent background" +msgstr "Arrière-plan transparent" @@ -2922,7 +3182,7 @@ index 69f634ec3bb5..8e17f9875e55 100644 +msgid "Set Title" +msgstr "Définir le titre" diff --git a/po/fur.po b/po/fur.po -index f72ff621bea9..f1cc939cbb21 100644 +index f72ff621..f1cc939c 100644 --- a/po/fur.po +++ b/po/fur.po @@ -545,6 +545,10 @@ msgstr "" @@ -2958,7 +3218,7 @@ index f72ff621bea9..f1cc939cbb21 100644 #~ msgid "" #~ "text/plain dropped on terminal had wrong format (%d) or length (%d)\n" diff --git a/po/ga.po b/po/ga.po -index 93d5fa9d1481..feb87dce3d6b 100644 +index 93d5fa9d..feb87dce 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1925,3 +1925,6 @@ msgstr "_Dún Fuinneog" @@ -2969,13 +3229,13 @@ index 93d5fa9d1481..feb87dce3d6b 100644 +msgid "Transparent background" +msgstr "Cúlra trédhearcach" diff --git a/po/gl.po b/po/gl.po -index e888be872f40..9be90e3f9f19 100644 +index de3dc5b9..e3a7944c 100644 --- a/po/gl.po +++ b/po/gl.po -@@ -2454,3 +2454,15 @@ msgstr "" - #: src/terminal-window.c:3245 - msgid "C_lose Window" - msgstr "P_echar a xanela" +@@ -2481,3 +2481,15 @@ msgstr "P_echar a xanela" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Produciuse un erro ao analizar os argumentos: %s\n" + +msgid "Title" +msgstr "Título" @@ -2989,7 +3249,7 @@ index e888be872f40..9be90e3f9f19 100644 +msgid "Transparent background" +msgstr "Fondo transparente" diff --git a/po/gu.po b/po/gu.po -index 76b459cf8dc5..485beeac98b7 100644 +index 76b459cf..485beeac 100644 --- a/po/gu.po +++ b/po/gu.po @@ -2155,8 +2155,8 @@ msgstr "વિન્ડો બંધ કરો (_l)" @@ -3037,10 +3297,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 5d54080e0e46..d4a1c10ced1a 100644 +index aeaf3993..54b763d4 100644 --- a/po/he.po +++ b/po/he.po -@@ -2776,17 +2776,17 @@ msgstr "סגירת ה_חלון" +@@ -2794,17 +2794,17 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "Default size:" #~ msgstr "גודל בררת מחדל:" @@ -3064,7 +3324,7 @@ index 5d54080e0e46..d4a1c10ced1a 100644 #~ msgid "Current Locale" #~ msgstr "השפה הנוכחית" -@@ -3598,8 +3598,8 @@ msgstr "סגירת ה_חלון" +@@ -3616,8 +3616,8 @@ msgstr "Failed to parse arguments: %s\n" #~ msgid "_Solid color" #~ msgstr "צבע _אחיד" @@ -3076,7 +3336,7 @@ index 5d54080e0e46..d4a1c10ced1a 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "No such profile \"%s\", using default profile\n" diff --git a/po/hi.po b/po/hi.po -index 2d7dc5b14008..8d3d0529df61 100644 +index 2d7dc5b1..8d3d0529 100644 --- a/po/hi.po +++ b/po/hi.po @@ -2267,9 +2267,8 @@ msgstr "विंडो बंद करें (_l)" @@ -3125,10 +3385,10 @@ index 2d7dc5b14008..8d3d0529df61 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "एस/कुंजी चैलेंज प्रतिक्रिया" diff --git a/po/hr.po b/po/hr.po -index 8cb0df752f2f..d7f96a287470 100644 +index cdf91b4f..8c43a4ca 100644 --- a/po/hr.po +++ b/po/hr.po -@@ -2737,3 +2737,13 @@ msgstr "_Zatvori prozor" +@@ -2768,3 +2768,13 @@ msgstr "Greška u obradi argumenata: %s\n" #~ msgid "Use transparency from system theme" #~ msgstr "Koristi prozirnost iz teme sustava" @@ -3143,13 +3403,13 @@ index 8cb0df752f2f..d7f96a287470 100644 +msgid "Set Title" +msgstr "Postavi naslov" diff --git a/po/hu.po b/po/hu.po -index 108bffdd2280..15cb987a97b4 100644 +index 66793a82..1595a86b 100644 --- a/po/hu.po +++ b/po/hu.po -@@ -2442,3 +2442,15 @@ msgstr "" - #: src/terminal-window.c:3245 - msgid "C_lose Window" - msgstr "_Ablak bezárása" +@@ -2463,3 +2463,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" + +msgid "Title" +msgstr "Cím" @@ -3163,7 +3423,7 @@ index 108bffdd2280..15cb987a97b4 100644 +msgid "Transparent background" +msgstr "Áttetsző háttér" diff --git a/po/hy.po b/po/hy.po -index aaf2d9b292da..4d466f164420 100644 +index aaf2d9b2..4d466f16 100644 --- a/po/hy.po +++ b/po/hy.po @@ -757,8 +757,8 @@ msgid "_Base on:" @@ -3189,10 +3449,10 @@ index aaf2d9b292da..4d466f164420 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 6ae0fdfc88b1..bafa8470fb84 100644 +index 66603f20..173067e4 100644 --- a/po/id.po +++ b/po/id.po -@@ -2451,3 +2451,15 @@ msgstr "Tutup Jende_la" +@@ -2471,3 +2471,15 @@ msgstr "Gagal mengurai argumen: \"%s\"\n" #~ msgid "_Detach Tab" #~ msgstr "_Pisahkan Tab" @@ -3209,7 +3469,7 @@ index 6ae0fdfc88b1..bafa8470fb84 100644 +msgid "Set Title" +msgstr "Atur Judul" diff --git a/po/it.po b/po/it.po -index 3daa8263d771..94b0093c2717 100644 +index 3daa8263..94b0093c 100644 --- a/po/it.po +++ b/po/it.po @@ -2468,3 +2468,15 @@ msgstr "" @@ -3229,7 +3489,7 @@ index 3daa8263d771..94b0093c2717 100644 +msgid "Set Title" +msgstr "Imposta titolo" diff --git a/po/ja.po b/po/ja.po -index ab72bc42e70b..690281a6713e 100644 +index ab72bc42..690281a6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2534,3 +2534,15 @@ msgstr "ウィンドウを閉じる(_L)" @@ -3249,7 +3509,7 @@ index ab72bc42e70b..690281a6713e 100644 +msgid "Set Title" +msgstr "タイトルを設定する" diff --git a/po/ka.po b/po/ka.po -index e0dd79f280a2..887d395ce150 100644 +index e0dd79f2..887d395c 100644 --- a/po/ka.po +++ b/po/ka.po @@ -219,8 +219,8 @@ msgid "Background" @@ -3273,10 +3533,10 @@ index e0dd79f280a2..887d395ce150 100644 #: ../src/gnome-terminal.glade2.h:87 diff --git a/po/kk.po b/po/kk.po -index 0fe441ad152f..3b7741150799 100644 +index 34ce6b2a..5d415eb3 100644 --- a/po/kk.po +++ b/po/kk.po -@@ -2721,3 +2721,15 @@ msgstr "Терезені жа_бу" +@@ -2741,3 +2741,15 @@ msgstr "Аргументтерді өндеу қатемен аяқталды: % #~ msgid "Be quiet" #~ msgstr "Тыныш болу" @@ -3293,7 +3553,7 @@ index 0fe441ad152f..3b7741150799 100644 +msgid "Set Title" +msgstr "Атауын орнату" diff --git a/po/km.po b/po/km.po -index 352897d2963b..b6db9394a307 100644 +index 352897d2..b6db9394 100644 --- a/po/km.po +++ b/po/km.po @@ -2909,8 +2909,8 @@ msgstr "បិទបង្អួច" @@ -3308,7 +3568,7 @@ index 352897d2963b..b6db9394a307 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "ដាក់ស្រមោលផ្ទៃខាងក្រោយថ្លា ឬផ្ទៃខាងក្រោយរូបភាព ៖" diff --git a/po/kn.po b/po/kn.po -index c887f88a2c87..0fc1c3139258 100644 +index c887f88a..0fc1c313 100644 --- a/po/kn.po +++ b/po/kn.po @@ -2261,8 +2261,8 @@ msgstr "ಕಿಟಕಿಯನ್ನು ಮುಚ್ಚು (_l)" @@ -3345,10 +3605,10 @@ index c887f88a2c87..0fc1c3139258 100644 +msgid "Transparent background" +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ" diff --git a/po/ko.po b/po/ko.po -index 85294d64485c..c993b31eec74 100644 +index 69cb4516..b9b7d7de 100644 --- a/po/ko.po +++ b/po/ko.po -@@ -2485,3 +2485,15 @@ msgstr "창 닫기(_L)" +@@ -2508,3 +2508,15 @@ msgstr "인자 파싱에 실패했습니다: %s\n" #~ msgid "Verbose output" #~ msgstr "많이 출력" @@ -3365,7 +3625,7 @@ index 85294d64485c..c993b31eec74 100644 +msgid "Set Title" +msgstr "제목 설정" diff --git a/po/ku.po b/po/ku.po -index bc2bb7f03de4..d2a83a007097 100644 +index bc2bb7f0..d2a83a00 100644 --- a/po/ku.po +++ b/po/ku.po @@ -223,8 +223,8 @@ msgid "Background" @@ -3391,10 +3651,10 @@ index bc2bb7f03de4..d2a83a007097 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/lt.po b/po/lt.po -index 50b776a16507..a0870247563b 100644 +index c2729c2f..55165274 100644 --- a/po/lt.po +++ b/po/lt.po -@@ -2748,3 +2748,15 @@ msgstr "_Užverti langą" +@@ -2770,3 +2770,15 @@ msgstr "Nepavyko apdoroti argumentų: %s\n" #~ msgid "Whether to use a dark theme variant" #~ msgstr "Ar naudoti tamsų temos variantą" @@ -3411,7 +3671,7 @@ index 50b776a16507..a0870247563b 100644 +msgid "Set Title" +msgstr "Nustatyti pavadinimą" diff --git a/po/lv.po b/po/lv.po -index 2e119003676c..30f28b559ee2 100644 +index 2e119003..30f28b55 100644 --- a/po/lv.po +++ b/po/lv.po @@ -2694,3 +2694,19 @@ msgstr "Aizvērt _logu" @@ -3435,7 +3695,7 @@ index 2e119003676c..30f28b559ee2 100644 +msgid "Set Title" +msgstr "Iestatīt nosaukumu" diff --git a/po/mai.po b/po/mai.po -index 715d0b9e1c82..0f31634e4f2e 100644 +index 715d0b9e..0f31634e 100644 --- a/po/mai.po +++ b/po/mai.po @@ -1044,8 +1044,8 @@ msgid "_Base on:" @@ -3461,7 +3721,7 @@ index 715d0b9e1c82..0f31634e4f2e 100644 #: ../src/profile-preferences.glade.h:70 msgid "_Update login records when command is launched" diff --git a/po/mg.po b/po/mg.po -index 99fa0f5e4059..a216602569af 100644 +index 99fa0f5e..a2166025 100644 --- a/po/mg.po +++ b/po/mg.po @@ -220,8 +220,8 @@ msgid "Background" @@ -3487,7 +3747,7 @@ index 99fa0f5e4059..a216602569af 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/mk.po b/po/mk.po -index 4fe43192fe57..a5a874b49c59 100644 +index 4fe43192..a5a874b4 100644 --- a/po/mk.po +++ b/po/mk.po @@ -863,8 +863,8 @@ msgid "_Base on:" @@ -3513,7 +3773,7 @@ index 4fe43192fe57..a5a874b49c59 100644 #: ../src/profile-preferences.glade.h:78 #| msgid "_Text color:" diff --git a/po/ml.po b/po/ml.po -index 296149701e1f..e3bce1225738 100644 +index 29614970..e3bce122 100644 --- a/po/ml.po +++ b/po/ml.po @@ -2577,3 +2577,6 @@ msgstr "ജാലകം അടയ്ക്കുക (_l)" @@ -3524,7 +3784,7 @@ index 296149701e1f..e3bce1225738 100644 +msgid "Transparent background" +msgstr "പുറകിലുള്ളവ കാണാവുന്ന പശ്ചാത്തലം" diff --git a/po/mn.po b/po/mn.po -index 2f9d86072d1c..09c4437d10f9 100644 +index 2f9d8607..09c4437d 100644 --- a/po/mn.po +++ b/po/mn.po @@ -217,8 +217,8 @@ msgid "Background" @@ -3550,7 +3810,7 @@ index 2f9d86072d1c..09c4437d10f9 100644 #: ../src/gnome-terminal.glade2.h:103 msgid "_Update login records when command is launched" diff --git a/po/mr.po b/po/mr.po -index 61997dafbd03..9c7dc77abd22 100644 +index 61997daf..9c7dc77a 100644 --- a/po/mr.po +++ b/po/mr.po @@ -2219,8 +2219,8 @@ msgstr "चौकट बंद करा (_l)" @@ -3598,7 +3858,7 @@ index 61997dafbd03..9c7dc77abd22 100644 #~ msgid "Disabled" #~ msgstr "अकार्यान्वीतित" diff --git a/po/ms.po b/po/ms.po -index 114f0d4e50c2..5d3f2e011f1c 100644 +index 114f0d4e..5d3f2e01 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2717,8 +2717,8 @@ msgstr "T_utup Tetingkap" @@ -3613,7 +3873,7 @@ index 114f0d4e50c2..5d3f2e011f1c 100644 #~ msgid "_Update login records when command is launched" #~ msgstr "_Kemaskini rekod logmasuk bila arahan dilancarkan" diff --git a/po/nb.po b/po/nb.po -index e48f82bf732b..4a311f73d1ad 100644 +index e48f82bf..4a311f73 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2406,3 +2406,15 @@ msgstr "" @@ -3633,7 +3893,7 @@ index e48f82bf732b..4a311f73d1ad 100644 +msgid "Set Title" +msgstr "Sett tittel" diff --git a/po/nds.po b/po/nds.po -index 82f930b1cc0c..d52fbd94eb58 100644 +index 82f930b1..d52fbd94 100644 --- a/po/nds.po +++ b/po/nds.po @@ -748,8 +748,8 @@ msgid "_Base on:" @@ -3659,7 +3919,7 @@ index 82f930b1cc0c..d52fbd94eb58 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 901aa9549be0..48b9b219369e 100644 +index 901aa954..48b9b219 100644 --- a/po/ne.po +++ b/po/ne.po @@ -2769,8 +2769,8 @@ msgstr "सञ्झ्याल बन्द गर्नुहोस्" @@ -3695,7 +3955,7 @@ index 901aa9549be0..48b9b219369e 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 215774cf23be..c5df70c52aac 100644 +index 215774cf..c5df70c5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -2786,3 +2786,15 @@ msgstr "Venster sl_uiten" @@ -3715,7 +3975,7 @@ index 215774cf23be..c5df70c52aac 100644 +msgid "Transparent background" +msgstr "Transparante achtergrond" diff --git a/po/nn.po b/po/nn.po -index 5aa43b113ed9..f892290c256f 100644 +index 5aa43b11..f892290c 100644 --- a/po/nn.po +++ b/po/nn.po @@ -1149,8 +1149,8 @@ msgid "_Base on:" @@ -3741,10 +4001,10 @@ index 5aa43b113ed9..f892290c256f 100644 #: ../src/profile-preferences.glade.h:74 msgid "_Update login records when command is launched" diff --git a/po/oc.po b/po/oc.po -index 169828e2828f..b4bdec693f2f 100644 +index 559f5fe4..ad35d847 100644 --- a/po/oc.po +++ b/po/oc.po -@@ -3010,8 +3010,8 @@ msgstr "Tampar _la fenèstra" +@@ -3027,8 +3027,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "Save as..." #~ msgstr "Enregistrar jos..." @@ -3755,7 +4015,7 @@ index 169828e2828f..b4bdec693f2f 100644 #~ msgid "_Detach tab" #~ msgstr "Des_tacar l'onglet" -@@ -3471,8 +3471,8 @@ msgstr "Tampar _la fenèstra" +@@ -3488,8 +3488,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "_Use the system fixed width font" #~ msgstr "_Utilizar la poliça de chassa fixa del sistèma" @@ -3766,7 +4026,7 @@ index 169828e2828f..b4bdec693f2f 100644 #~ msgid "The shortcut key “%s” is already bound to the “%s” action" #~ msgstr "L'acorchi de clavièr « %s » es ja atribuit a l'accion « %s »" -@@ -3789,8 +3789,8 @@ msgstr "Tampar _la fenèstra" +@@ -3806,8 +3806,8 @@ msgstr "Impossible d'analisar los paramètres : %s\n" #~ msgid "Run;" #~ msgstr "Executar;Consòla;Shell;" @@ -3778,7 +4038,7 @@ index 169828e2828f..b4bdec693f2f 100644 #~ msgid "" #~ "A subset of possible encodings are presented in the Encoding submenu. " diff --git a/po/or.po b/po/or.po -index ec1e6bfb9a28..218acd712df6 100644 +index ec1e6bfb..218acd71 100644 --- a/po/or.po +++ b/po/or.po @@ -2705,8 +2705,8 @@ msgstr "ଶୀର୍ଷକ (_T):" @@ -3793,7 +4053,7 @@ index ec1e6bfb9a28..218acd712df6 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "ଛାୟା ସ୍ବଚ୍ଛ କିମ୍ବା ଚିତ୍ର ପୃଷ୍ଠଭୂମି (_h):" diff --git a/po/pa.po b/po/pa.po -index 1cb4b46dc2aa..2bdd01fecaab 100644 +index 1cb4b46d..2bdd01fe 100644 --- a/po/pa.po +++ b/po/pa.po @@ -2718,10 +2718,9 @@ msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ(_l)" @@ -3849,7 +4109,7 @@ index 1cb4b46dc2aa..2bdd01fecaab 100644 #~ msgid "S/Key Challenge Response" #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ" diff --git a/po/ps.po b/po/ps.po -index b25a2cb41712..3855b2f3423f 100644 +index b25a2cb4..3855b2f3 100644 --- a/po/ps.po +++ b/po/ps.po @@ -810,8 +810,8 @@ msgid "_Base on:" @@ -3875,10 +4135,10 @@ index b25a2cb41712..3855b2f3423f 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 280fce039ade..a67e810bcc0e 100644 +index fe592f2d..3b3d411f 100644 --- a/po/pt.po +++ b/po/pt.po -@@ -2823,11 +2823,11 @@ msgstr "Fechar jane_la" +@@ -2843,11 +2843,11 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "Default size:" #~ msgstr "Tamanho predefinido:" @@ -3894,7 +4154,7 @@ index 280fce039ade..a67e810bcc0e 100644 #~ msgid "Title and Command" #~ msgstr "Título e comando" -@@ -2835,8 +2835,8 @@ msgstr "Fechar jane_la" +@@ -2855,8 +2855,8 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "_Unlimited" #~ msgstr "_Ilimitado" @@ -3905,7 +4165,7 @@ index 280fce039ade..a67e810bcc0e 100644 #~ msgid "Current Locale" #~ msgstr "Configuração Regional Atual" -@@ -3590,8 +3590,8 @@ msgstr "Fechar jane_la" +@@ -3610,8 +3610,8 @@ msgstr "Falha ao processar argumentos: %s\n" #~ msgid "Background image _scrolls" #~ msgstr "Imagem de fundo _rola" @@ -3917,45 +4177,30 @@ index 280fce039ade..a67e810bcc0e 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "Transparente som_breado ou imagem de fundo:" diff --git a/po/pt_BR.po b/po/pt_BR.po -index 6a090deacdbf..76018a131b4e 100644 +index dbdfda9e..f44ff3e7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po -@@ -2866,17 +2866,17 @@ msgstr "_Fechar janela" - #~ msgid "Default size:" - #~ msgstr "Tamanho padrão:" - --#~ msgid "Title" --#~ msgstr "Título" +@@ -2482,3 +2482,15 @@ msgstr "_Fechar janela" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Falha ao analisar os argumentos: %s\n" ++ +msgid "Title" +msgstr "Título" - --#~ msgid "_Title:" --#~ msgstr "_Título:" ++ +msgid "_Title:" +msgstr "_Título:" - - #~ msgid "Title and Command" - #~ msgstr "Título e comando" - --#~ msgid "Set Title" --#~ msgstr "Definir título" ++ +msgid "Set Title" +msgstr "Definir título" - - #~ msgid "Current Locale" - #~ msgstr "Codificação atual" -@@ -3502,3 +3502,6 @@ msgstr "_Fechar janela" - #~ "terminal poderão usar. Essa é a paleta, na forma de uma lista de nomes de " - #~ "cores separada por dois pontos. Os nomes de cores devem estar no formato " - #~ "hexadecimal. Exemplo: \"#FF00FF\"" + +msgid "Transparent background" +msgstr "Fundo transparente" diff --git a/po/ro.po b/po/ro.po -index c56e66372500..f8c4821246cc 100644 +index 627aea90..14d04172 100644 --- a/po/ro.po +++ b/po/ro.po -@@ -3525,8 +3525,8 @@ msgstr "Î_nchide fereastra" +@@ -3545,8 +3545,8 @@ msgstr "Parsarea argumentelor a eșuat: %s\n" #~ msgid "_Solid color" #~ msgstr "Culoare _solidă" @@ -3967,10 +4212,10 @@ index c56e66372500..f8c4821246cc 100644 #~ msgid "_Unlimited" #~ msgstr "_Neliminat" diff --git a/po/ru.po b/po/ru.po -index d6f6dd4f8279..814ba613679f 100644 +index efd96c4e..1af341b0 100644 --- a/po/ru.po +++ b/po/ru.po -@@ -2552,3 +2552,19 @@ msgstr "_Закрыть окно" +@@ -2746,3 +2746,19 @@ msgstr "Не удалось разобрать аргументы: %s\n" #~ msgid "_Add or Remove…" #~ msgstr "_Добавить или удалить…" @@ -3991,7 +4236,7 @@ index d6f6dd4f8279..814ba613679f 100644 +msgid "Set Title" +msgstr "Установить заголовок" diff --git a/po/rw.po b/po/rw.po -index 012f64e325c3..5ff633f8b3c2 100644 +index 012f64e3..5ff633f8 100644 --- a/po/rw.po +++ b/po/rw.po @@ -749,7 +749,7 @@ msgstr "Ibara ry'Inyandiko..." @@ -4012,7 +4257,7 @@ index 012f64e325c3..5ff633f8b3c2 100644 msgstr "Umutwe..." diff --git a/po/si.po b/po/si.po -index adca7d5acba9..6379cee7f0a3 100644 +index adca7d5a..6379cee7 100644 --- a/po/si.po +++ b/po/si.po @@ -218,8 +218,8 @@ msgid "Background" @@ -4038,7 +4283,7 @@ index adca7d5acba9..6379cee7f0a3 100644 #: ../src/gnome-terminal.glade2.h:87 msgid "_Update login records when command is launched" diff --git a/po/sk.po b/po/sk.po -index e6745075ee55..20d303c8a302 100644 +index e6745075..20d303c8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3086,3 +3086,15 @@ msgstr "_Zavrieť okno" @@ -4058,10 +4303,10 @@ index e6745075ee55..20d303c8a302 100644 +msgid "Set Title" +msgstr "Nastaviť titulok" diff --git a/po/sl.po b/po/sl.po -index c1013d494ec0..662aff8ca029 100644 +index 3db69906..901b475a 100644 --- a/po/sl.po +++ b/po/sl.po -@@ -2846,17 +2846,17 @@ msgstr "_Zapri okno" +@@ -2866,17 +2866,17 @@ msgstr "Napaka med razčlenjevanjem argumentov: %s\n" #~ msgid "Default size:" #~ msgstr "Privzeta velikost:" @@ -4085,7 +4330,7 @@ index c1013d494ec0..662aff8ca029 100644 #~ msgid "Current Locale" #~ msgstr "Trenutne jezikovne nastavitve" -@@ -2971,3 +2971,6 @@ msgstr "_Zapri okno" +@@ -2991,3 +2991,6 @@ msgstr "Napaka med razčlenjevanjem argumentov: %s\n" #~ msgid "_Profile Preferences…" #~ msgstr "Možnosti _profila ..." @@ -4093,7 +4338,7 @@ index c1013d494ec0..662aff8ca029 100644 +msgid "Transparent background" +msgstr "Prosojno ozadje" diff --git a/po/sq.po b/po/sq.po -index 158f6cb167cc..a3494fb70bd6 100644 +index 158f6cb1..a3494fb7 100644 --- a/po/sq.po +++ b/po/sq.po @@ -225,8 +225,8 @@ msgid "Background" @@ -4119,7 +4364,7 @@ index 158f6cb167cc..a3494fb70bd6 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 2612029b1220..0b6077adb561 100644 +index 2612029b..0b6077ad 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2756,10 +2756,9 @@ msgstr "_Затвори прозор" @@ -4171,7 +4416,7 @@ index 2612029b1220..0b6077adb561 100644 +msgid "Transparent background" +msgstr "Провидна позадина" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po -index 45dbad07fba7..852c47cc6ee5 100644 +index 45dbad07..852c47cc 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -2576,10 +2576,9 @@ msgstr "_Zatvori prozor" @@ -4223,10 +4468,10 @@ index 45dbad07fba7..852c47cc6ee5 100644 +msgid "Transparent background" +msgstr "Providna pozadina" diff --git a/po/sv.po b/po/sv.po -index 9684cb530eae..9c4b14577ce6 100644 +index ab9667fe..d7826a4c 100644 --- a/po/sv.po +++ b/po/sv.po -@@ -2748,5 +2748,17 @@ msgstr "Stän_g fönster" +@@ -2775,5 +2775,17 @@ msgstr "Misslyckades med att tolka argument: %s\n" #~ msgid "Unknown completion request for \"%s\"" #~ msgstr "Okänd kompletteringsbegäran för \"%s\"" @@ -4245,7 +4490,7 @@ index 9684cb530eae..9c4b14577ce6 100644 +msgid "_Set Title…" +msgstr "A_nge titel..." diff --git a/po/ta.po b/po/ta.po -index 80aa2f684eec..afd335b0faf0 100644 +index 80aa2f68..afd335b0 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2171,10 +2171,9 @@ msgstr "_l சாளரத்தை மூடவும்" @@ -4312,7 +4557,7 @@ index 80aa2f684eec..afd335b0faf0 100644 #~ msgid "No such profile \"%s\", using default profile\n" #~ msgstr "\"%s\" என்ற வரியுரு கிடையாது, முன்னிருப்பு வரியுரு பயன்படுத்தப்படும்\n" diff --git a/po/te.po b/po/te.po -index 82c0e0fc8f54..0dd3d871f639 100644 +index 82c0e0fc..0dd3d871 100644 --- a/po/te.po +++ b/po/te.po @@ -2055,10 +2055,9 @@ msgstr "కిటికీని మూసివేయి (_l)" @@ -4376,7 +4621,7 @@ index 82c0e0fc8f54..0dd3d871f639 100644 #~ msgid "S_hade transparent or image background:" #~ msgstr "పారదర్శకంగా మారు లేదా చిత్రము బ్యాక్‌గ్రౌండ్ కు మారు(_h):" diff --git a/po/tg.po b/po/tg.po -index e3feef658e1e..6371c036626f 100644 +index e3feef65..6371c036 100644 --- a/po/tg.po +++ b/po/tg.po @@ -2158,23 +2158,23 @@ msgstr "П_ӯшонидани равзана" @@ -4412,7 +4657,7 @@ index e3feef658e1e..6371c036626f 100644 #~ msgid "_Next Tab" #~ msgstr "_Варақаи навбатӣ" diff --git a/po/th.po b/po/th.po -index 63263749655c..496da331bbf9 100644 +index 63263749..496da331 100644 --- a/po/th.po +++ b/po/th.po @@ -2308,23 +2308,23 @@ msgstr "ปิ_ดหน้าต่าง" @@ -4459,10 +4704,10 @@ index 63263749655c..496da331bbf9 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 4f5908b325e3..e1f235170b79 100644 +index 18edefc7..8b4893c4 100644 --- a/po/tr.po +++ b/po/tr.po -@@ -2739,3 +2739,15 @@ msgstr "_Pencereyi Kapat" +@@ -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ı" @@ -4479,7 +4724,7 @@ index 4f5908b325e3..e1f235170b79 100644 +msgid "_Set Title…" +msgstr "_Başlığı Ata..." diff --git a/po/ug.po b/po/ug.po -index 313f76b98eae..be6089762082 100644 +index 313f76b9..be608976 100644 --- a/po/ug.po +++ b/po/ug.po @@ -2616,8 +2616,8 @@ msgstr "ماۋزۇ (_T):" @@ -4494,13 +4739,13 @@ index 313f76b98eae..be6089762082 100644 #~ msgid "" #~ "You already have a profile called “%s”. Do you want to create another " diff --git a/po/uk.po b/po/uk.po -index 2540955ef92e..ab8fb252af3d 100644 +index 6a7c02e5..6fa50f40 100644 --- a/po/uk.po +++ b/po/uk.po -@@ -2431,3 +2431,18 @@ msgstr "" - #: src/terminal-window.c:3242 - msgid "C_lose Window" - msgstr "Закр_ити вікно" +@@ -2453,3 +2453,18 @@ msgstr "Закр_ити вікно" + #, c-format + msgid "Failed to parse arguments: %s\n" + msgstr "Не вдається визначити аргументи: %s\n" + +msgid "Title" +msgstr "Заголовок" @@ -4517,7 +4762,7 @@ index 2540955ef92e..ab8fb252af3d 100644 +msgid "Transparent background" +msgstr "Прозоре тло" diff --git a/po/vi.po b/po/vi.po -index 5304429b4674..af014ff2473e 100644 +index 5304429b..af014ff2 100644 --- a/po/vi.po +++ b/po/vi.po @@ -2852,8 +2852,8 @@ msgstr "Đón_g cửa sổ" @@ -4561,7 +4806,7 @@ index 5304429b4674..af014ff2473e 100644 +msgid "Transparent background" +msgstr "Nền trong suốt" diff --git a/po/wa.po b/po/wa.po -index 2a29945bbc74..4f1c57c71e94 100644 +index 2a29945b..4f1c57c7 100644 --- a/po/wa.po +++ b/po/wa.po @@ -224,8 +224,8 @@ msgid "Background" @@ -4598,7 +4843,7 @@ index 2a29945bbc74..4f1c57c71e94 100644 #: ../src/terminal-window.c:1020 msgid "Set _Character Encoding" diff --git a/po/xh.po b/po/xh.po -index cb78ec67db2d..a4f3b4ddcfb6 100644 +index cb78ec67..a4f3b4dd 100644 --- a/po/xh.po +++ b/po/xh.po @@ -217,8 +217,8 @@ msgid "Background" @@ -4635,10 +4880,10 @@ index cb78ec67db2d..a4f3b4ddcfb6 100644 #: ../src/terminal-window.c:986 msgid "Set _Character Encoding" diff --git a/po/zh_CN.po b/po/zh_CN.po -index ffc817c7fab1..6e9d037d37ec 100644 +index 8546f215..cd1d380a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po -@@ -2763,17 +2763,17 @@ msgstr "关闭窗口(_L)" +@@ -2783,17 +2783,17 @@ msgstr "无法处理参数：%s\n" #~ msgid "Default size:" #~ msgstr "默认大小：" @@ -4662,7 +4907,7 @@ index ffc817c7fab1..6e9d037d37ec 100644 #~ msgid "Current Locale" #~ msgstr "当前区域" -@@ -2886,3 +2886,6 @@ msgstr "关闭窗口(_L)" +@@ -2906,3 +2906,6 @@ msgstr "无法处理参数：%s\n" #~ msgid "_Find..." #~ msgstr "查找(_F)..." @@ -4670,7 +4915,7 @@ index ffc817c7fab1..6e9d037d37ec 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_HK.po b/po/zh_HK.po -index 61153529f0c7..c366abddd1af 100644 +index 61153529..c366abdd 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -2114,17 +2114,17 @@ msgstr "關閉視窗(_L)" @@ -4705,7 +4950,7 @@ index 61153529f0c7..c366abddd1af 100644 +msgid "Transparent background" +msgstr "透明背景" diff --git a/po/zh_TW.po b/po/zh_TW.po -index 80cb23434a60..20e2a93ce3f0 100644 +index 80cb2343..20e2a93c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2735,17 +2735,17 @@ msgstr "關閉視窗(_L)" @@ -4740,13 +4985,13 @@ index 80cb23434a60..20e2a93ce3f0 100644 +msgid "Transparent background" +msgstr "透明背景" -- -2.31.1 +2.32.0 -From 5d71d4d1728cc106230b28f208d95450c49db59a Mon Sep 17 00:00:00 2001 +From 932cda700ffa51e88eb15e4fade85907567eb5df Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Wed, 25 May 2016 13:47:36 +0200 -Subject: [PATCH 12/16] Restore the action and shortcut to set a static title +Subject: [PATCH 13/17] Restore the action and shortcut to set a static title from the menus This reverts 9bbe19e98f62aa3c9020913a3a5a8080a5177505 with various @@ -4755,12 +5000,12 @@ minor adjustments to keep up with later changes. https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 4 ++ - src/terminal-accels.c | 2 + - src/terminal-window.c | 75 ++++++++++++++++++++++++++++++ - 3 files changed, 81 insertions(+) + src/terminal-accels.cc | 2 + + src/terminal-window.cc | 76 ++++++++++++++++++++++++++++++ + 3 files changed, 82 insertions(+) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 3ef53b8b40b8..3d28d5fd7ca0 100644 +index 3ef53b8b..3d28d5fd 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -429,6 +429,10 @@ @@ -4774,10 +5019,10 @@ index 3ef53b8b40b8..3d28d5fd7ca0 100644 <key name="reset" type="s"> <default>'disabled'</default> <summary>Keyboard shortcut to reset the terminal</summary> -diff --git a/src/terminal-accels.c b/src/terminal-accels.c -index 333c6d17006c..c0371c5cada4 100644 ---- a/src/terminal-accels.c -+++ b/src/terminal-accels.c +diff --git a/src/terminal-accels.cc b/src/terminal-accels.cc +index 66298100..b2b4e442 100644 +--- a/src/terminal-accels.cc ++++ b/src/terminal-accels.cc @@ -76,6 +76,7 @@ #define KEY_RESET "reset" #define KEY_SAVE_CONTENTS "save-contents" @@ -4787,18 +5032,18 @@ index 333c6d17006c..c0371c5cada4 100644 #define KEY_ZOOM_IN "zoom-in" #define KEY_ZOOM_NORMAL "zoom-normal" @@ -165,6 +166,7 @@ static KeyEntry terminal_entries[] = { - ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", NULL, NULL ), + ENTRY (N_("Read-Only"), KEY_READ_ONLY, "read-only", nullptr, nullptr ), ENTRY (N_("Reset"), KEY_RESET, "reset", "b", "false"), ENTRY (N_("Reset and Clear"), KEY_RESET_AND_CLEAR, "reset", "b", "true" ), -+ ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", NULL, NULL ), ++ ENTRY (N_("Set Title"), KEY_SET_TERMINAL_TITLE, "set-title", nullptr, nullptr ), }; static KeyEntry tabs_entries[] = { -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 6d1fa95d8b3a..69596045d43e 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -749,6 +749,80 @@ action_select_all_cb (GSimpleAction *action, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 5513eedc..0fcc8e31 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -753,6 +753,81 @@ action_select_all_cb (GSimpleAction *action, vte_terminal_select_all (VTE_TERMINAL (priv->active_screen)); } @@ -4825,17 +5070,18 @@ index 6d1fa95d8b3a..69596045d43e 100644 + GVariant *parameter, + gpointer user_data) +{ -+ TerminalWindow *window = user_data; ++ TerminalWindow *window = (TerminalWindow*)user_data; + TerminalWindowPrivate *priv = window->priv; + GtkWidget *dialog, *message_area, *hbox, *label, *entry; + -+ if (priv->active_screen == NULL) ++ if (priv->active_screen == nullptr) + return; + + /* FIXME: hook the screen up so this dialogue closes if the terminal screen closes */ + + dialog = gtk_message_dialog_new (GTK_WINDOW (window), -+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, ++ GtkDialogFlags(GTK_DIALOG_MODAL | ++ GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_MESSAGE_OTHER, + GTK_BUTTONS_OK_CANCEL, + "%s", ""); @@ -4849,10 +5095,10 @@ index 6d1fa95d8b3a..69596045d43e 100644 + g_signal_connect (dialog, "response", + G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen); + g_signal_connect (dialog, "delete-event", -+ G_CALLBACK (terminal_util_dialog_response_on_delete), NULL); ++ G_CALLBACK (terminal_util_dialog_response_on_delete), nullptr); + + message_area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog)); -+ gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, NULL); ++ gtk_container_foreach (GTK_CONTAINER (message_area), (GtkCallback) gtk_widget_hide, nullptr); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); + gtk_box_pack_start (GTK_BOX (message_area), hbox, FALSE, FALSE, 0); @@ -4879,52 +5125,52 @@ index 6d1fa95d8b3a..69596045d43e 100644 static void action_reset_cb (GSimpleAction *action, GVariant *parameter, -@@ -2107,6 +2181,7 @@ terminal_window_init (TerminalWindow *window) - { "paste-uris", action_paste_uris_cb, NULL, NULL, NULL }, - { "reset", action_reset_cb, "b", NULL, NULL }, - { "select-all", action_select_all_cb, NULL, NULL, NULL }, -+ { "set-title", action_set_title_cb, NULL, NULL, NULL }, - { "size-to", action_size_to_cb, "(uu)", NULL, NULL }, - { "tab-detach", action_tab_detach_cb, NULL, NULL, NULL }, - { "tab-move-left", action_tab_move_left_cb, NULL, NULL, NULL }, +@@ -2111,6 +2186,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 }, ++ { "set-title", action_set_title_cb, nullptr, nullptr, nullptr }, + { "size-to", action_size_to_cb, "(uu)", nullptr, nullptr }, + { "tab-detach", action_tab_detach_cb, nullptr, nullptr, nullptr }, + { "tab-move-left", action_tab_move_left_cb, nullptr, nullptr, nullptr }, -- -2.31.1 +2.32.0 -From 8df8cab8326904951559876d7600ce8135ca8d88 Mon Sep 17 00:00:00 2001 +From 00d98f36e6ea7d50438db1a97e122e0363f1cff0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 30 Jun 2016 18:14:36 +0200 -Subject: [PATCH 13/16] screen: Style fix +Subject: [PATCH 14/17] screen: Style fix This brings the code in line with how it was before de0dc7c2649c42e2aa02a66e4be27d262b34452d https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- - src/terminal-screen.c | 2 +- + src/terminal-screen.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index a3386dac16b5..19c265839dc7 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -835,7 +835,7 @@ terminal_screen_new (GSettings *profile, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index f8650501..4a48cd2e 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -842,7 +842,7 @@ terminal_screen_new (GSettings *profile, /* If given an initial title, strip it of control characters and * feed it to the terminal. */ -- if (title != NULL) { +- if (title != nullptr) { + if (title) { GString *seq; const char *p; -- -2.31.1 +2.32.0 -From 023fe19f34ddd3b5efab064015d707dd005e34dc Mon Sep 17 00:00:00 2001 +From a2bd48e8eb44106357638651eef9f682deef8780 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 30 Jun 2016 16:58:15 +0200 -Subject: [PATCH 14/16] Restore the rest of the title handling options and make +Subject: [PATCH 15/17] Restore the rest of the title handling options and make it all work This reverts commit f27bf0135a2d18ba22158d28bf1f8c5f6ec066c8 and makes @@ -4934,16 +5180,16 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1296110 --- src/org.gnome.Terminal.gschema.xml | 12 ++ src/preferences.ui | 33 +++- - src/profile-editor.c | 9 + - src/terminal-enums.h | 8 + - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 257 +++++++++++++++++++++-------- - src/terminal-screen.h | 8 +- - src/terminal-window.c | 9 +- - 8 files changed, 263 insertions(+), 74 deletions(-) + src/profile-editor.cc | 10 ++ + src/terminal-enums.hh | 8 + + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 258 +++++++++++++++++++++-------- + src/terminal-screen.hh | 8 +- + src/terminal-window.cc | 9 +- + 8 files changed, 264 insertions(+), 75 deletions(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index 3d28d5fd7ca0..d67da299d14a 100644 +index 3d28d5fd..d67da299 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -24,6 +24,13 @@ @@ -4973,7 +5219,7 @@ index 3d28d5fd7ca0..d67da299d14a 100644 <default l10n="messages" context="title">'Terminal'</default> <summary>Title for terminal</summary> diff --git a/src/preferences.ui b/src/preferences.ui -index f86f8c980f89..c45366ae52fc 100644 +index f86f8c98..c45366ae 100644 --- a/src/preferences.ui +++ b/src/preferences.ui @@ -2002,7 +2002,7 @@ @@ -5023,30 +5269,31 @@ index f86f8c980f89..c45366ae52fc 100644 </object> </child> </object> -diff --git a/src/profile-editor.c b/src/profile-editor.c -index df1f219608c4..1aa05fb33a92 100644 ---- a/src/profile-editor.c -+++ b/src/profile-editor.c -@@ -1373,6 +1373,15 @@ profile_prefs_load (const char *uuid, GSettings *profile) - gtk_builder_get_object (builder, "title-entry"), +diff --git a/src/profile-editor.cc b/src/profile-editor.cc +index 1a4ab30d..9488480e 100644 +--- a/src/profile-editor.cc ++++ b/src/profile-editor.cc +@@ -1423,6 +1423,16 @@ profile_prefs_load (const char *uuid, GSettings *profile) "text", - G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); + GSettingsBindFlags(G_SETTINGS_BIND_GET | + G_SETTINGS_BIND_SET)); + profile_prefs_settings_bind_with_mapping (profile, + TERMINAL_PROFILE_TITLE_MODE_KEY, + gtk_builder_get_object (builder, + "title-mode-combobox"), + "active", -+ G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET, ++ GSettingsBindFlags(G_SETTINGS_BIND_GET | ++ G_SETTINGS_BIND_SET), + (GSettingsBindGetMapping) string_to_enum, + (GSettingsBindSetMapping) enum_to_string, -+ terminal_title_mode_get_type, NULL); ++ terminal_title_mode_get_type, nullptr); profile_prefs_settings_bind (profile, TERMINAL_PROFILE_USE_CUSTOM_COMMAND_KEY, gtk_builder_get_object (builder, "use-custom-command-checkbutton"), -diff --git a/src/terminal-enums.h b/src/terminal-enums.h -index 93f1460c2207..5e816f71c10e 100644 ---- a/src/terminal-enums.h -+++ b/src/terminal-enums.h +diff --git a/src/terminal-enums.hh b/src/terminal-enums.hh +index 93f1460c..5e816f71 100644 +--- a/src/terminal-enums.hh ++++ b/src/terminal-enums.hh @@ -34,6 +34,14 @@ typedef enum { TERMINAL_NEW_TAB_POSITION_NEXT } TerminalNewTabPosition; @@ -5062,10 +5309,10 @@ index 93f1460c2207..5e816f71c10e 100644 typedef enum { TERMINAL_EXIT_CLOSE, -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index 16e5c3264725..bb3048fafe48 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index 16e5c326..bb3048fa 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh @@ -71,6 +71,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" #define TERMINAL_PROFILE_SCROLL_ON_OUTPUT_KEY "scroll-on-output" @@ -5074,10 +5321,10 @@ index 16e5c3264725..bb3048fafe48 100644 #define TERMINAL_PROFILE_TITLE_KEY "title" #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 19c265839dc7..c715e592a19a 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index 4a48cd2e..e4ba5c76 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -111,8 +111,11 @@ struct _TerminalScreenPrivate ExecData *exec_data; @@ -5119,7 +5366,7 @@ index 19c265839dc7..c715e592a19a 100644 gtk_target_table_free (targets, n_targets); gtk_target_list_unref (target_list); -+ priv->override_title = NULL; ++ priv->override_title = nullptr; + priv->user_title = FALSE; + g_signal_connect (screen, "window-title-changed", @@ -5136,28 +5383,29 @@ index 19c265839dc7..c715e592a19a 100644 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -619,7 +626,6 @@ terminal_screen_set_property (GObject *object, - terminal_screen_set_profile (screen, g_value_get_object (value)); + terminal_screen_set_profile (screen, (GSettings*)g_value_get_object (value)); break; case PROP_TITLE: - case PROP_DESCRIPTION: /* not writable */ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -@@ -709,13 +715,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) - NULL, - G_PARAM_READABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); - -- g_object_class_install_property (object_class, -- PROP_DESCRIPTION, -- g_param_spec_string ("description", NULL, NULL, -- NULL, -- G_PARAM_READABLE | -- G_PARAM_STATIC_STRINGS)); +@@ -715,14 +721,6 @@ terminal_screen_class_init (TerminalScreenClass *klass) + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB))); + +- g_object_class_install_property +- (object_class, +- PROP_DESCRIPTION, +- g_param_spec_string ("description", nullptr, nullptr, +- nullptr, +- GParamFlags(G_PARAM_READABLE | +- G_PARAM_STATIC_STRINGS))); - g_type_class_add_private (object_class, sizeof (TerminalScreenPrivate)); n_url_regexes = G_N_ELEMENTS (url_regex_patterns); -@@ -812,7 +811,9 @@ terminal_screen_finalize (GObject *object) +@@ -819,7 +817,9 @@ terminal_screen_finalize (GObject *object) g_free (priv->uuid); g_free (priv->current_cmdline); @@ -5168,7 +5416,7 @@ index 19c265839dc7..c715e592a19a 100644 G_OBJECT_CLASS (terminal_screen_parent_class)->finalize (object); } -@@ -832,28 +833,8 @@ terminal_screen_new (GSettings *profile, +@@ -839,28 +839,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)); @@ -5199,7 +5447,7 @@ index 19c265839dc7..c715e592a19a 100644 vte_terminal_set_font_scale (VTE_TERMINAL (screen), zoom); terminal_screen_set_font (screen); -@@ -1064,28 +1045,139 @@ terminal_screen_exec (TerminalScreen *screen, +@@ -1072,28 +1052,139 @@ terminal_screen_exec (TerminalScreen *screen, return TRUE; } @@ -5220,11 +5468,11 @@ index 19c265839dc7..c715e592a19a 100644 - return vte_terminal_get_window_title (VTE_TERMINAL (screen)); + TerminalScreenPrivate *priv = screen->priv; + -+ if (priv->cooked_title == NULL) ++ if (priv->cooked_title == nullptr) + terminal_screen_cook_title (screen); + -+ /* cooked_title may still be NULL */ -+ if (priv->cooked_title != NULL) ++ /* cooked_title may still be nullptr */ ++ if (priv->cooked_title != nullptr) + return priv->cooked_title; + else + return ""; @@ -5240,8 +5488,10 @@ index 19c265839dc7..c715e592a19a 100644 + */ +static const char * +terminal_screen_get_title_format (TerminalScreen *screen) -+{ -+ TerminalScreenPrivate *priv = screen->priv; + { + TerminalScreenPrivate *priv = screen->priv; +- gs_free char *title_string = nullptr; +- const char *title; + static const char *formats[] = { + "%A" /* TERMINAL_TITLE_REPLACE */, + "%D%-%S" /* TERMINAL_TITLE_BEFORE */, @@ -5259,7 +5509,7 @@ index 19c265839dc7..c715e592a19a 100644 + * @titleptr <inout>: pointer of the current title string + * + * Format title according @format, and stores it in <literal>*titleptr</literal>. -+ * Always ensures that *titleptr will be non-NULL. ++ * Always ensures that *titleptr will be non-nullptr. + * + * Returns: %TRUE iff the title changed + */ @@ -5267,13 +5517,11 @@ index 19c265839dc7..c715e592a19a 100644 +terminal_screen_format_title (TerminalScreen *screen, + const char *raw_title, + char **titleptr) - { - TerminalScreenPrivate *priv = screen->priv; -- gs_free char *title_string = NULL; -- const char *title; -+ gs_free char *static_title_string = NULL; ++{ ++ TerminalScreenPrivate *priv = screen->priv; ++ gs_free char *static_title_string = nullptr; + const char *format, *arg; -+ const char *static_title = NULL; ++ const char *static_title = nullptr; + GString *title; + gboolean add_sep = FALSE; + @@ -5293,10 +5541,13 @@ index 19c265839dc7..c715e592a19a 100644 + format = terminal_screen_get_title_format (screen); + for (arg = format; *arg; arg += 2) + { -+ const char *text_to_append = NULL; ++ const char *text_to_append = nullptr; + + g_assert (arg[0] == '%'); -+ + +- return g_strdup_printf ("%s — %d", +- title && title[0] ? title : _("Terminal"), +- screen->priv->child_pid); + switch (arg[1]) + { + case 'A': @@ -5309,7 +5560,7 @@ index 19c265839dc7..c715e592a19a 100644 + text_to_append = static_title; + break; + case '-': -+ text_to_append = NULL; ++ text_to_append = nullptr; + add_sep = TRUE; + break; + default: @@ -5325,11 +5576,8 @@ index 19c265839dc7..c715e592a19a 100644 + g_string_append (title, text_to_append); + add_sep = FALSE; + } - -- return g_strdup_printf ("%s — %d", -- title && title[0] ? title : _("Terminal"), -- screen->priv->child_pid); -+ if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) ++ ++ if (*titleptr == nullptr || strcmp (title->str, *titleptr) != 0) + { + g_free (*titleptr); + *titleptr = g_string_free (title, FALSE); @@ -5350,7 +5598,7 @@ index 19c265839dc7..c715e592a19a 100644 } static void -@@ -1128,9 +1220,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1136,9 +1227,10 @@ terminal_screen_profile_changed_cb (GSettings *profile, } if (!prop_name || @@ -5362,7 +5610,7 @@ index 19c265839dc7..c715e592a19a 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1422,7 +1515,6 @@ terminal_screen_set_profile (TerminalScreen *screen, +@@ -1430,7 +1522,6 @@ terminal_screen_set_profile (TerminalScreen *screen, g_object_unref (old_profile); g_object_notify (G_OBJECT (screen), "profile"); @@ -5370,7 +5618,7 @@ index 19c265839dc7..c715e592a19a 100644 } GSettings* -@@ -1689,8 +1781,6 @@ spawn_result_cb (VteTerminal *terminal, +@@ -1699,8 +1790,6 @@ spawn_result_cb (VteTerminal *terminal, priv->child_pid = pid; @@ -5378,8 +5626,8 @@ index 19c265839dc7..c715e592a19a 100644 - if (error) { // FIXMEchpe should be unnecessary, vte already does this internally - vte_terminal_set_pty (terminal, NULL); -@@ -1981,33 +2071,45 @@ terminal_screen_focus_in (GtkWidget *widget, + vte_terminal_set_pty (terminal, nullptr); +@@ -1992,33 +2081,45 @@ terminal_screen_focus_in (GtkWidget *widget, return GTK_WIDGET_CLASS (terminal_screen_parent_class)->focus_in_event (widget, event); } @@ -5403,13 +5651,12 @@ index 19c265839dc7..c715e592a19a 100644 return; - g_free (priv->title); -- priv->title = title && title[0] ? g_strdup (title) : NULL; +- priv->title = title && title[0] ? g_strdup (title) : nullptr; + g_free (priv->raw_title); + priv->raw_title = g_strdup (title); + terminal_screen_cook_title (screen); +} - -- g_object_notify (G_OBJECT (screen), "description"); ++ +void +terminal_screen_set_override_title (TerminalScreen *screen, + const char *title) @@ -5420,7 +5667,8 @@ index 19c265839dc7..c715e592a19a 100644 + old_title = priv->override_title; + priv->override_title = g_strdup (title); + g_free (old_title); -+ + +- g_object_notify (G_OBJECT (screen), "description"); + terminal_screen_set_dynamic_title (screen, title, FALSE); } @@ -5430,7 +5678,7 @@ index 19c265839dc7..c715e592a19a 100644 { - TerminalScreenPrivate *priv; - - g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), NULL); + g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), nullptr); - priv = screen->priv; - @@ -5439,7 +5687,7 @@ index 19c265839dc7..c715e592a19a 100644 } /** -@@ -2040,7 +2142,9 @@ static void +@@ -2051,7 +2152,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5450,16 +5698,16 @@ index 19c265839dc7..c715e592a19a 100644 } static void -@@ -2063,8 +2167,6 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2074,8 +2177,6 @@ terminal_screen_child_exited (VteTerminal *terminal, priv->child_pid = -1; - g_object_notify (G_OBJECT (screen), "description"); - - action = g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY); + action = TerminalExitAction(g_settings_get_enum (priv->profile, TERMINAL_PROFILE_EXIT_ACTION_KEY)); switch (action) -@@ -2108,6 +2210,23 @@ terminal_screen_child_exited (VteTerminal *terminal, +@@ -2119,6 +2220,23 @@ terminal_screen_child_exited (VteTerminal *terminal, } } @@ -5483,10 +5731,10 @@ index 19c265839dc7..c715e592a19a 100644 static gboolean terminal_screen_contents_changed_cb (TerminalScreen *screen) { -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index 9a9a562a9d84..69fd56f66392 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index 9a9a562a..69fd56f6 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -113,13 +113,17 @@ void terminal_screen_set_profile (TerminalScreen *screen, GSettings* terminal_screen_get_profile (TerminalScreen *screen); GSettings* terminal_screen_ref_profile (TerminalScreen *screen); @@ -5507,11 +5755,11 @@ index 9a9a562a9d84..69fd56f66392 100644 char *terminal_screen_get_current_dir (TerminalScreen *screen); void terminal_screen_get_size (TerminalScreen *screen, -diff --git a/src/terminal-window.c b/src/terminal-window.c -index 69596045d43e..b8ab17eac3c5 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -767,6 +767,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 0fcc8e31..3e730bc8 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -771,6 +771,12 @@ terminal_set_title_dialog_response_cb (GtkWidget *dialog, gtk_widget_destroy (dialog); } @@ -5524,7 +5772,7 @@ index 69596045d43e..b8ab17eac3c5 100644 static void action_set_title_cb (GSimpleAction *action, GVariant *parameter, -@@ -2542,8 +2548,7 @@ sync_screen_title (TerminalScreen *screen, +@@ -2549,8 +2555,7 @@ sync_screen_title (TerminalScreen *screen, return; title = terminal_screen_get_title (screen); @@ -5535,13 +5783,13 @@ index 69596045d43e..b8ab17eac3c5 100644 static void -- -2.31.1 +2.32.0 -From 749289f4bf0359dd67519d82cf66a33fff4548e3 Mon Sep 17 00:00:00 2001 +From 55cfa62792f327f9ffd43e9f97a0b3c88ae701f0 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Wed, 3 Apr 2019 15:38:09 +0200 -Subject: [PATCH 15/16] Update the title with the current foreground process +Subject: [PATCH 16/17] Update the title with the current foreground process Some changes by: Bill Nottingham <notting(a)splat.cc> @@ -5550,12 +5798,12 @@ Some changes by: https://bugzilla.gnome.org/show_bug.cgi?id=711060 --- src/org.gnome.Terminal.gschema.xml | 5 ++++ - src/terminal-schemas.h | 1 + - src/terminal-screen.c | 45 +++++++++++++++++++++++++++++- + src/terminal-schemas.hh | 1 + + src/terminal-screen.cc | 45 +++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml -index d67da299d14a..0939471736a3 100644 +index d67da299..09394717 100644 --- a/src/org.gnome.Terminal.gschema.xml +++ b/src/org.gnome.Terminal.gschema.xml @@ -275,6 +275,11 @@ @@ -5570,10 +5818,10 @@ index d67da299d14a..0939471736a3 100644 <key name="exit-action" enum="org.gnome.Terminal.ExitAction"> <default>'close'</default> <summary>What to do with the terminal when the child command exits</summary> -diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h -index bb3048fafe48..d5ee2a88b22f 100644 ---- a/src/terminal-schemas.h -+++ b/src/terminal-schemas.h +diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh +index bb3048fa..d5ee2a88 100644 +--- a/src/terminal-schemas.hh ++++ b/src/terminal-schemas.hh @@ -70,6 +70,7 @@ G_BEGIN_DECLS #define TERMINAL_PROFILE_SCROLLBAR_POLICY_KEY "scrollbar-policy" #define TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY "scroll-on-keystroke" @@ -5582,10 +5830,10 @@ index bb3048fafe48..d5ee2a88b22f 100644 #define TERMINAL_PROFILE_TEXT_BLINK_MODE_KEY "text-blink-mode" #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 c715e592a19a..8566312b879e 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index e4ba5c76..ba007835 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc @@ -110,7 +110,9 @@ struct _TerminalScreenPrivate guint idle_exec_source; ExecData *exec_data; @@ -5596,18 +5844,18 @@ index c715e592a19a..8566312b879e 100644 gboolean user_title; /* title was manually set */ char *current_cmdline; char *raw_title; -@@ -1160,6 +1162,26 @@ terminal_screen_format_title (TerminalScreen *screen, +@@ -1167,6 +1169,26 @@ terminal_screen_format_title (TerminalScreen *screen, add_sep = FALSE; } + if (priv->show_foreground_process && + !priv->application_title && + !priv->user_title && -+ priv->current_cmdline != NULL && ++ priv->current_cmdline != nullptr && + priv->current_cmdline[0] != '\0') + { -+ gs_free char *current_cmdline_truncated = NULL; -+ gs_free char *current_cmdline_valid = NULL; ++ gs_free char *current_cmdline_truncated = nullptr; ++ gs_free char *current_cmdline_valid = nullptr; + glong len_truncated; + glong len_valid; + @@ -5620,10 +5868,10 @@ index c715e592a19a..8566312b879e 100644 + g_string_append_printf (title, " — %s", current_cmdline_truncated); + } + - if (*titleptr == NULL || strcmp (title->str, *titleptr) != 0) + if (*titleptr == nullptr || strcmp (title->str, *titleptr) != 0) { g_free (*titleptr); -@@ -1189,6 +1211,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1196,6 +1218,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, GObject *object = G_OBJECT (screen); VteTerminal *vte_terminal = VTE_TERMINAL (screen); TerminalWindow *window; @@ -5631,7 +5879,7 @@ index c715e592a19a..8566312b879e 100644 g_object_freeze_notify (object); -@@ -1223,7 +1246,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1230,7 +1253,7 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_TITLE_MODE_KEY) || prop_name == I_(TERMINAL_PROFILE_TITLE_KEY)) { @@ -5640,7 +5888,7 @@ index c715e592a19a..8566312b879e 100644 } if (gtk_widget_get_realized (GTK_WIDGET (screen)) && -@@ -1251,6 +1274,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1258,6 +1281,13 @@ terminal_screen_profile_changed_cb (GSettings *profile, prop_name == I_(TERMINAL_PROFILE_BACKGROUND_TRANSPARENCY_PERCENT)) update_color_scheme (screen); @@ -5654,7 +5902,7 @@ index c715e592a19a..8566312b879e 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)); -@@ -1315,6 +1345,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, +@@ -1322,6 +1352,9 @@ terminal_screen_profile_changed_cb (GSettings *profile, vte_terminal_set_word_char_exceptions (vte_terminal, word_char_exceptions); } @@ -5664,7 +5912,7 @@ index c715e592a19a..8566312b879e 100644 g_object_thaw_notify (object); } -@@ -2142,6 +2175,9 @@ static void +@@ -2152,6 +2185,9 @@ static void terminal_screen_window_title_changed (VteTerminal *vte_terminal, TerminalScreen *screen) { @@ -5674,8 +5922,8 @@ index c715e592a19a..8566312b879e 100644 terminal_screen_set_dynamic_title (screen, vte_terminal_get_window_title (vte_terminal), FALSE); -@@ -2248,6 +2284,8 @@ terminal_screen_contents_changed_cb (TerminalScreen *screen) - priv->current_cmdline = g_steal_pointer (&cmdline); +@@ -2259,6 +2295,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); + terminal_screen_cook_title (screen); @@ -5683,7 +5931,7 @@ index c715e592a19a..8566312b879e 100644 out: priv->contents_changed_source_id = 0; return G_SOURCE_REMOVE; -@@ -2340,6 +2378,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2351,6 +2389,7 @@ terminal_screen_shell_precmd (VteTerminal *terminal) _terminal_debug_print (TERMINAL_DEBUG_SHELL_COMMAND, "Shell precmd\n"); @@ -5691,7 +5939,7 @@ index c715e592a19a..8566312b879e 100644 priv->between_preexec_and_precmd = FALSE; if (priv->contents_changed_source_id != 0) -@@ -2359,6 +2398,8 @@ terminal_screen_shell_precmd (VteTerminal *terminal) +@@ -2370,6 +2409,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"); @@ -5700,8 +5948,8 @@ index c715e592a19a..8566312b879e 100644 } static gboolean -@@ -2379,6 +2420,8 @@ terminal_screen_shell_preexec_cb (TerminalScreen *screen) - priv->current_cmdline = g_steal_pointer (&cmdline); +@@ -2391,6 +2432,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); + terminal_screen_cook_title (screen); @@ -5710,29 +5958,29 @@ index c715e592a19a..8566312b879e 100644 retval = G_SOURCE_REMOVE; -- -2.31.1 +2.32.0 -From 823ee952840f976a3bda0a26cb4095c81e5c2dcb Mon Sep 17 00:00:00 2001 +From 63c41ea272cdd690b1b35c2d6150110765cd2113 Mon Sep 17 00:00:00 2001 From: Debarshi Ray <debarshir(a)gnome.org> Date: Thu, 27 Feb 2020 19:32:08 +0100 -Subject: [PATCH 16/16] screen, window: Preserve current toolbox, if any +Subject: [PATCH 17/17] screen, window: Preserve current toolbox, if any This relies on toolbox(1) emitting a terminal escape sequence that advertises the name of the current toolbox container. https://gitlab.freedesktop.org/terminal-wg/specifications/issues/17 --- - src/terminal-screen.c | 33 ++++++++++++++++++++++++++++++++- - src/terminal-screen.h | 6 ++++++ - src/terminal-window.c | 26 ++++++++++++++++++++++++-- + src/terminal-screen.cc | 33 ++++++++++++++++++++++++++++++++- + src/terminal-screen.hh | 6 ++++++ + src/terminal-window.cc | 26 ++++++++++++++++++++++++-- 3 files changed, 62 insertions(+), 3 deletions(-) -diff --git a/src/terminal-screen.c b/src/terminal-screen.c -index 8566312b879e..c37dbdcd02be 100644 ---- a/src/terminal-screen.c -+++ b/src/terminal-screen.c -@@ -879,6 +879,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +diff --git a/src/terminal-screen.cc b/src/terminal-screen.cc +index ba007835..76f7d3ce 100644 +--- a/src/terminal-screen.cc ++++ b/src/terminal-screen.cc +@@ -885,6 +885,25 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, TerminalScreen *parent_screen, GCancellable *cancellable, GError **error) @@ -5744,7 +5992,7 @@ index 8566312b879e..c37dbdcd02be 100644 + + return terminal_screen_reexec_from_screen_with_override_command (screen, + parent_screen, -+ NULL, ++ nullptr, + cancellable, + error); +} @@ -5758,14 +6006,14 @@ index 8566312b879e..c37dbdcd02be 100644 { g_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE); -@@ -890,8 +909,20 @@ terminal_screen_reexec_from_screen (TerminalScreen *screen, +@@ -896,8 +915,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); -+ if (override_command != NULL) ++ if (override_command != nullptr) + { -+ g_return_val_if_fail (parent_screen->priv->exec_data != NULL, FALSE); -+ g_return_val_if_fail (data != NULL, FALSE); ++ g_return_val_if_fail (parent_screen->priv->exec_data != nullptr, FALSE); ++ g_return_val_if_fail (data != nullptr, FALSE); + + g_strfreev (data->argv); + data->argv = g_strdupv (override_command); @@ -5780,10 +6028,10 @@ index 8566312b879e..c37dbdcd02be 100644 screen, parent_screen, cwd); -diff --git a/src/terminal-screen.h b/src/terminal-screen.h -index 69fd56f66392..b2acd1d4045a 100644 ---- a/src/terminal-screen.h -+++ b/src/terminal-screen.h +diff --git a/src/terminal-screen.hh b/src/terminal-screen.hh +index 69fd56f6..b2acd1d4 100644 +--- a/src/terminal-screen.hh ++++ b/src/terminal-screen.hh @@ -108,6 +108,12 @@ gboolean terminal_screen_reexec_from_screen (TerminalScreen *screen, GCancellable *cancellable, GError **error); @@ -5797,43 +6045,43 @@ index 69fd56f66392..b2acd1d4045a 100644 void terminal_screen_set_profile (TerminalScreen *screen, GSettings *profile); GSettings* terminal_screen_get_profile (TerminalScreen *screen); -diff --git a/src/terminal-window.c b/src/terminal-window.c -index b8ab17eac3c5..ba23e7c99d3d 100644 ---- a/src/terminal-window.c -+++ b/src/terminal-window.c -@@ -405,8 +405,30 @@ action_new_terminal_cb (GSimpleAction *action, +diff --git a/src/terminal-window.cc b/src/terminal-window.cc +index 3e730bc8..e58c34f2 100644 +--- a/src/terminal-window.cc ++++ b/src/terminal-window.cc +@@ -406,8 +406,30 @@ action_new_terminal_cb (GSimpleAction *action, terminal_window_switch_screen (window, screen); gtk_widget_grab_focus (GTK_WIDGET (screen)); - /* Start child process, if possible by using the same args as the parent screen */ -- terminal_screen_reexec_from_screen (screen, parent_screen, NULL, NULL); +- terminal_screen_reexec_from_screen (screen, parent_screen, nullptr, nullptr); + const char *container_name = vte_terminal_get_current_container_name (VTE_TERMINAL (parent_screen)); + const char *container_runtime = vte_terminal_get_current_container_runtime (VTE_TERMINAL (parent_screen)); -+ if (g_strcmp0 (container_runtime, "toolbox") == 0 && container_name != NULL && container_name[0] != '\0') ++ if (g_strcmp0 (container_runtime, "toolbox") == 0 && container_name != nullptr && container_name[0] != '\0') + { -+ gs_free_error GError *error = NULL; -+ gs_free char *override_command_str = NULL; -+ gs_strfreev char **override_command = NULL; ++ gs_free_error GError *error = nullptr; ++ gs_free char *override_command_str = nullptr; ++ gs_strfreev char **override_command = nullptr; + + override_command_str = g_strdup_printf ("toolbox enter --container %s", container_name); -+ if (!g_shell_parse_argv (override_command_str, NULL, &override_command, &error)) ++ if (!g_shell_parse_argv (override_command_str, nullptr, &override_command, &error)) + g_printerr ("Failed to parse '%s': %s\n", override_command_str, error->message); + + /* Start child process, if possible by using the same args as the parent screen */ + terminal_screen_reexec_from_screen_with_override_command (screen, + parent_screen, + override_command, -+ NULL, -+ NULL); ++ nullptr, ++ nullptr); + } + else + { + /* Start child process, if possible by using the same args as the parent screen */ -+ terminal_screen_reexec_from_screen (screen, parent_screen, NULL, NULL); ++ terminal_screen_reexec_from_screen (screen, parent_screen, nullptr, nullptr); + } if (mode == TERMINAL_NEW_TERMINAL_MODE_WINDOW) gtk_window_present (GTK_WINDOW (window)); -- -2.31.1 +2.32.0 diff --git a/gnome-terminal.spec b/gnome-terminal.spec index e3975a5..d2d9fc7 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -7,16 +7,16 @@ %define desktop_file_utils_version 0.2.90 Name: gnome-terminal -Version: 3.40.3 +Version: 3.42.0 Release: 1%{?dist} Summary: Terminal emulator for GNOME License: GPLv3+ and GFDL and LGPLv2+ URL: https://wiki.gnome.org/Apps/Terminal -Source0: https://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.bz2 Source1: org.gnome.Terminal.gschema.override -Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch +Patch0: gnome-terminal-cntr-ntfy-autottl-ts.patch BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -29,11 +29,11 @@ BuildRequires: pkgconfig(vte-2.91) >= %{vte_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: docbook-style-xsl BuildRequires: gettext-devel >= %{gettext_version} -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gnome-shell BuildRequires: itstool BuildRequires: libxslt -BuildRequires: make +BuildRequires: meson BuildRequires: systemd-rpm-macros BuildRequires: yelp-tools @@ -62,19 +62,16 @@ option to the right-click context menu in Nautilus. %autosetup -p1 %build -%configure \ - --disable-silent-rules \ - --disable-static \ - --enable-debug \ - --with-gtk=3.0 \ - --with-nautilus-extension +%meson \ + -Ddebug=true \ + -Ddocs=true \ + -Dnautilus_extension=true \ + -Dsearch_provider=true -%make_build +%meson_build %install -%make_install - -rm -f %{buildroot}%{_libdir}/nautilus/extensions-3.0/*.la +%meson_install install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas @@ -82,14 +79,14 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas %check desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Terminal.desktop -make check +%meson_test %files -f %{gettext_package}.lang %license COPYING -%doc AUTHORS NEWS +%doc AUTHORS README.md %{_bindir}/gnome-terminal -%{_datadir}/metainfo/org.gnome.Terminal.appdata.xml +%{_datadir}/metainfo/org.gnome.Terminal.metainfo.xml %{_datadir}/applications/org.gnome.Terminal.desktop %{_libexecdir}/gnome-terminal-server %{_datadir}/dbus-1/services/org.gnome.Terminal.service @@ -110,6 +107,9 @@ make check %{_datadir}/metainfo/org.gnome.Terminal.Nautilus.metainfo.xml %changelog +* Tue Sep 28 2021 David King <amigadave(a)amigadave.com> - 3.42.0-1 +- Update to 3.42.0 + * Tue Aug 24 2021 David King <amigadave(a)amigadave.com> - 3.40.3-1 - Update to 3.40.3 - Minor packaging improvements diff --git a/sources b/sources index aa92163..0ca6ba8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-terminal-3.40.3.tar.xz) = a4de627f88069f3a1cc69a53dfe4c29ebdd22ee604b0e0b1702dd1c7a14a5fb877968c020bece7f0d5d7dc496019ffef0f9b2d15cb17c80c0a99b331a64f8346 +SHA512 (gnome-terminal-3.42.0.tar.bz2) = 76513c27e045b9c96ba2f78292f514b6f206b7bcecd11f42ac5fb1525d79d3ee1615b203aecf1b8b03b021b2bd2315fbeb7e6d1b2546345c2fd7f9c8cb21ec2f https://src.fedoraproject.org/rpms/gnome-terminal/c/d57e059e5015e873e08f58d…

1 0

decathorpe pushed to rust-wasm-bindgen-macro-support (f34). "Update to version 0.2.78; Fixes RHBZ#2002380"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:19:19 UTC From c73acb72c1a926187f8211d87417dca46724fca8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:34:29 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002380 --- diff --git a/rust-wasm-bindgen-macro-support.spec b/rust-wasm-bindgen-macro-support.spec index 7cb88de..3d2b478 100644 --- a/rust-wasm-bindgen-macro-support.spec +++ b/rust-wasm-bindgen-macro-support.spec @@ -5,7 +5,7 @@ %global crate wasm-bindgen-macro-support Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Part of the implementation of the #[wasm_bindgen] attribute diff --git a/sources b/sources index efa35ad..76952bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-macro-support-0.2.76.crate) = 5f239585ecfe48488e6ad68acb0238faaaff15fd3269d3c44e41e690f538c4520fe2ded83800ecfd74525059321c2c3648ffede93e1db32b89c935c745b7e9d3 +SHA512 (wasm-bindgen-macro-support-0.2.78.crate) = 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236 https://src.fedoraproject.org/rpms/rust-wasm-bindgen-macro-support/c/c73acb…

1 0

decathorpe pushed to rust-wasm-bindgen-macro-support (f35). "Update to version 0.2.78; Fixes RHBZ#2002380"
by notifications＠fedoraproject.org 30 Sep '21

30 Sep '21

Notification time stamped 2021-09-30 22:19:04 UTC From c73acb72c1a926187f8211d87417dca46724fca8 Mon Sep 17 00:00:00 2001 From: Fabio Valentini <decathorpe(a)gmail.com> Date: Sep 30 2021 21:34:29 +0000 Subject: Update to version 0.2.78; Fixes RHBZ#2002380 --- diff --git a/rust-wasm-bindgen-macro-support.spec b/rust-wasm-bindgen-macro-support.spec index 7cb88de..3d2b478 100644 --- a/rust-wasm-bindgen-macro-support.spec +++ b/rust-wasm-bindgen-macro-support.spec @@ -5,7 +5,7 @@ %global crate wasm-bindgen-macro-support Name: rust-%{crate} -Version: 0.2.76 +Version: 0.2.78 Release: %autorelease Summary: Part of the implementation of the #[wasm_bindgen] attribute diff --git a/sources b/sources index efa35ad..76952bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wasm-bindgen-macro-support-0.2.76.crate) = 5f239585ecfe48488e6ad68acb0238faaaff15fd3269d3c44e41e690f538c4520fe2ded83800ecfd74525059321c2c3648ffede93e1db32b89c935c745b7e9d3 +SHA512 (wasm-bindgen-macro-support-0.2.78.crate) = 84d9867407a7caa942ab11f0ad1c343839bf51793930cdc3ebc5279ca370062eda006540448cc401f6afa078dbb1523b348ae69f4c6d7ccc9a7b8fa1ff895236 https://src.fedoraproject.org/rpms/rust-wasm-bindgen-macro-support/c/c73acb…

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits September 2021