Version 3.18.0

author: Manuel Hüsers 2015-10-07 16:05:43 +0200
committer: Manuel Hüsers 2015-10-07 16:05:43 +0200
commit: ebe86eb5b081cf01a714ba9ea079cc2de1bbe4a1 (patch)
tree: 31e48d2cfc573b0f2389c31a63ea9f28e0866f0f
parent: c96fa161525172b1045c801b49a00a4be64afba5 (diff)
download: aur-ebe86eb5b081cf01a714ba9ea079cc2de1bbe4a1.tar.gz
9 files changed, 648 insertions, 344 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a560881773d..fcc4b1fc63be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = gnome-terminal-fedora
 	pkgdesc = The GNOME Terminal Emulator with Fedora patches
-	pkgver = 3.17.91
+	pkgver = 3.18.0
 	pkgrel = 1
-	url = http://www.gnome.org
+	url = https://www.gnome.org
 	install = gnome-terminal-fedora.install
 	arch = i686
 	arch = x86_64
@@ -24,15 +24,23 @@ pkgbase = gnome-terminal-fedora
 	optdepends = gconf: settings migration when upgrading from older version
 	conflicts = gnome-terminal
 	options = !emptydirs
-	source = https://download.gnome.org/sources/gnome-terminal/3.17/gnome-terminal-3.17.91.tar.xz
+	source = https://download.gnome.org/sources/gnome-terminal/3.18/gnome-terminal-3.18.0.tar.xz
 	source = 0001-build-Don-t-treat-warnings-as-errors.patch
+	source = gnome-terminal-symbolic-new-tab-icon.patch
+	source = 0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch
+	source = 0001-window-Exit-early-from-screen-removed-handler-for-no.patch
+	source = 0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch
 	source = gnome-terminal-restore-dark-transparency.patch
 	source = gnome-terminal-command-notify.patch
 	source = org.gnome.Terminal.gschema.override
-	sha256sums = 7f4e190f64fcbfd425727801500cd7516376c229de50b654ecbe5410fadf6771
+	sha256sums = 776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6
 	sha256sums = 83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7
-	sha256sums = 173e9aada1dfa2c2b29bc82fe539b9bcf6c9ca6f9710e526367eb8cd0eb0925e
-	sha256sums = 99f693b7d176cc11b66eb26e561b9c2dd8e105d8e3e6462365eed57543734499
+	sha256sums = 5a3d70ffca64e81f10ede0ed222199581bfb8e92bec26d89dc86130243f8994d
+	sha256sums = d6dbc0c09781d6a75604c7f01aa2554131bd00194c89d9a5fa33fa503587632e
+	sha256sums = f342a1fd7785b53961c2b74f54d966bb6418c3a72ee06d37c562d20873451884
+	sha256sums = 70454385d5f6c51a1524928976526df00da80aa6a7061bb37e669040645a5f11
+	sha256sums = d912e5e889c50ecdae880728dc78bf227f4f736ab27a3748f97f343658e2c30a
+	sha256sums = d7ca2a58dfd0c44352dbb70ec48a3ba20ea514be7652cc023785a4cdb5257e05
 	sha256sums = e2797c0591e45b7cf4e7e8d3b926803bcff129d88dfe3b54f63dc61e0c8377de
 
 pkgname = gnome-terminal-fedora
diff --git a/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch b/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch
new file mode 100644
index 000000000000..21d193ff5110
--- /dev/null
+++ b/0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch
@@ -0,0 +1,43 @@
+From ece6bbee10191c60674669c810915ae741ee6d7c Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 Sep 2015 16:56:15 +0200
+Subject: [PATCH] notebook: Don't change show-tabs when going to empty notebook
+
+The window will close anyway, so the change is unnecessary. This fixes
+a crash in terminal-window's show-tabs change handler.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755240
+(cherry picked from commit 7b7c38d01b198c9e2b32e2e6161472178f7492fa)
+---
+ src/terminal-notebook.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
+index d6c9dd101c94..34236f9e7a43 100644
+--- a/src/terminal-notebook.c
++++ b/src/terminal-notebook.c
+@@ -58,14 +58,20 @@ update_tab_visibility (TerminalNotebook *notebook,
+ {
+   TerminalNotebookPrivate *priv = notebook->priv;
+   GtkNotebook *gtk_notebook = GTK_NOTEBOOK (notebook);
++  int new_n_pages;
+   gboolean show_tabs;
+ 
++  new_n_pages = gtk_notebook_get_n_pages (gtk_notebook) + change;
++  /* Don't do anything if we're going to have zero pages (and thus close the window) */
++  if (new_n_pages == 0)
++    return;
++
+   switch (priv->policy) {
+   case GTK_POLICY_ALWAYS:
+     show_tabs = TRUE;
+     break;
+   case GTK_POLICY_AUTOMATIC:
+-    show_tabs = (gtk_notebook_get_n_pages (gtk_notebook) + change) > 1;
++    show_tabs = new_n_pages > 1;
+     break;
+   case GTK_POLICY_NEVER:
+ #if GTK_CHECK_VERSION (3, 16, 0)
+-- 
+2.1.0
+
diff --git a/0001-window-Exit-early-from-screen-removed-handler-for-no.patch b/0001-window-Exit-early-from-screen-removed-handler-for-no.patch
new file mode 100644
index 000000000000..67074dc5080c
--- /dev/null
+++ b/0001-window-Exit-early-from-screen-removed-handler-for-no.patch
@@ -0,0 +1,62 @@
+From 44c6df308a2e5c331b44797c8537da430bb92df7 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 Sep 2015 16:58:34 +0200
+Subject: [PATCH] window: Exit early from screen-removed handler for now empty
+ notebook
+
+When the notebook is now empty, it's not necessary to change anything else
+since the window will be closed right away. Since GtkNotebook doesn't send
+the switch-page signal when removing the last and only screen in the notebook,
+priv->active_tab will point to an already freed object, which causes a
+crash when the window tries to update itself for the new active tab.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755240
+(cherry picked from commit c8704ba3fef98d4acd59ec061566ff540b77c528)
+---
+ src/terminal-window.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index e065ac1de49d..91279663fb50 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -3468,10 +3468,24 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
+                                         G_CALLBACK (screen_close_cb),
+                                         window);
+ 
++  /* We already got a switch-page signal whose handler sets the active tab to the
++   * new active tab, unless this screen was the only one in the notebook, so
++   * priv->active_tab is valid here.
++   */
++
++  pages = terminal_mdi_container_get_n_screens (container);
++  if (pages == 0)
++    {
++      priv->active_screen = NULL;
++
++      /* That was the last tab in the window; close it. */
++      gtk_widget_destroy (GTK_WIDGET (window));
++      return;
++    }
++
+   terminal_window_update_tabs_menu_sensitivity (window);
+   terminal_window_update_search_sensitivity (screen, window);
+ 
+-  pages = terminal_mdi_container_get_n_screens (container);
+   if (pages == 1)
+     {
+       TerminalScreen *active_screen = terminal_mdi_container_get_active_screen (container);
+@@ -3479,10 +3493,6 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
+ 
+       terminal_window_update_size (window);
+     }
+-  else if (pages == 0)
+-    {
+-      gtk_widget_destroy (GTK_WIDGET (window));
+-    }
+ }
+ 
+ gboolean
+-- 
+2.1.0
+
diff --git a/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch b/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch
new file mode 100644
index 000000000000..36e7fda1a0b7
--- /dev/null
+++ b/0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch
@@ -0,0 +1,39 @@
+From 448cb610ed7c9f243275050b4b3a530561f0f8ab Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 5 Oct 2015 20:13:05 +0200
+Subject: [PATCH] window: Pass tab switching keys to the terminal for tabless
+ windows
+
+This was removed as a side effect of
+a319aeb66f36e728af1b4929ddd69574df838702
+
+https://bugzilla.gnome.org/show_bug.cgi?id=730128
+---
+ src/terminal-window.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 91279663fb50..618425c0e4d5 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -1820,6 +1820,7 @@ static void
+ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
+ {
+   TerminalWindowPrivate *priv = window->priv;
++  GAction *gaction;
+   GtkActionGroup *action_group = priv->action_group;
+   GtkAction *action;
+   int num_pages, page_num;
+@@ -1856,6 +1857,9 @@ terminal_window_update_tabs_menu_sensitivity (TerminalWindow *window)
+   gtk_action_set_sensitive (action, not_last);
+ #endif
+ 
++  gaction = g_action_map_lookup_action (G_ACTION_MAP (window), "switch-tab");
++  g_simple_action_set_enabled (G_SIMPLE_ACTION (gaction), num_pages > 1);
++
+   action = gtk_action_group_get_action (action_group, "TabsMoveLeft");
+   gtk_action_set_sensitive (action, not_first);
+   action = gtk_action_group_get_action (action_group, "TabsMoveRight");
+-- 
+2.1.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 9db39d5ac629..0433bc3fb713 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,52 @@
 
 pkgname=gnome-terminal-fedora
 _pkgname=gnome-terminal
-pkgver=3.17.91
+pkgver=3.18.0
 pkgrel=1
-pkgdesc="The GNOME Terminal Emulator with Fedora patches"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(vte3-notification gsettings-desktop-schemas dconf libnautilus-extension)
-makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils
-             appdata-tools gnome-shell gconf vala yelp-tools)
+pkgdesc='The GNOME Terminal Emulator with Fedora patches'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('vte3-notification' 'gsettings-desktop-schemas' 'dconf' 'libnautilus-extension')
+makedepends=('gnome-doc-utils' 'intltool' 'itstool' 'docbook-xsl' 'desktop-file-utils'
+             'appdata-tools' 'gnome-shell' 'gconf' 'vala' 'yelp-tools')
 optdepends=('gconf: settings migration when upgrading from older version')
 options=('!emptydirs')
-url="http://www.gnome.org"
+url='https://www.gnome.org'
 conflicts=('gnome-terminal')
-install=gnome-terminal-fedora.install
-source=("https://download.gnome.org/sources/$_pkgname/${pkgver::4}/$_pkgname-$pkgver.tar.xz"
+install="${pkgname}.install"
+source=(
+	"https://download.gnome.org/sources/${_pkgname}/${pkgver::4}/$_pkgname-${pkgver}.tar.xz"
 	'0001-build-Don-t-treat-warnings-as-errors.patch'
+	'gnome-terminal-symbolic-new-tab-icon.patch'
+	'0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch'
+	'0001-window-Exit-early-from-screen-removed-handler-for-no.patch'
+	'0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch'
 	'gnome-terminal-restore-dark-transparency.patch'
 	'gnome-terminal-command-notify.patch'
-	'org.gnome.Terminal.gschema.override')
-sha256sums=('7f4e190f64fcbfd425727801500cd7516376c229de50b654ecbe5410fadf6771'
+	'org.gnome.Terminal.gschema.override'
+)
+sha256sums=(
+	'776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6'
 	'83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7'
-	'173e9aada1dfa2c2b29bc82fe539b9bcf6c9ca6f9710e526367eb8cd0eb0925e'
-	'99f693b7d176cc11b66eb26e561b9c2dd8e105d8e3e6462365eed57543734499'
-	'e2797c0591e45b7cf4e7e8d3b926803bcff129d88dfe3b54f63dc61e0c8377de')
+	'5a3d70ffca64e81f10ede0ed222199581bfb8e92bec26d89dc86130243f8994d'
+	'd6dbc0c09781d6a75604c7f01aa2554131bd00194c89d9a5fa33fa503587632e'
+	'f342a1fd7785b53961c2b74f54d966bb6418c3a72ee06d37c562d20873451884'
+	'70454385d5f6c51a1524928976526df00da80aa6a7061bb37e669040645a5f11'
+	'd912e5e889c50ecdae880728dc78bf227f4f736ab27a3748f97f343658e2c30a'
+	'd7ca2a58dfd0c44352dbb70ec48a3ba20ea514be7652cc023785a4cdb5257e05'
+	'e2797c0591e45b7cf4e7e8d3b926803bcff129d88dfe3b54f63dc61e0c8377de'
+)
 
 prepare () {
 	cd "${_pkgname}-${pkgver}"
 
-	patch -p1 -i ../0001-build-Don-t-treat-warnings-as-errors.patch
-	patch -p1 -i ../gnome-terminal-restore-dark-transparency.patch
-	patch -p1 -i ../gnome-terminal-command-notify.patch
+	patch -p1 -i '../0001-build-Don-t-treat-warnings-as-errors.patch'
+	patch -p1 -i '../gnome-terminal-symbolic-new-tab-icon.patch'
+	patch -p1 -i '../0001-notebook-Don-t-change-show-tabs-when-going-to-empty-.patch'
+	patch -p1 -i '../0001-window-Exit-early-from-screen-removed-handler-for-no.patch'
+	patch -p1 -i '../0001-window-Pass-tab-switching-keys-to-the-terminal-for-t.patch'
+	patch -p1 -i '../gnome-terminal-restore-dark-transparency.patch'
+	patch -p1 -i '../gnome-terminal-command-notify.patch'
 
 	autoreconf -f -i
 }
diff --git a/gnome-terminal-command-notify.patch b/gnome-terminal-command-notify.patch
index f63347bd932d..04df40301395 100644
--- a/gnome-terminal-command-notify.patch
+++ b/gnome-terminal-command-notify.patch
@@ -1,198 +1,20 @@
-diff -rupN gnome-terminal-3.17.91/Makefile.am gnome-terminal-3.17.91-patched/Makefile.am
---- gnome-terminal-3.17.91/Makefile.am	2015-03-23 20:01:11.000000000 +0100
-+++ gnome-terminal-3.17.91-patched/Makefile.am	2015-09-15 23:31:09.697283772 +0200
-@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
- 	$(NULL)
- 
- desktopdir = $(datadir)/applications
--desktop_in_files = @PACKAGE@.desktop.in.in
-+desktop_in_files = org.gnome.Terminal.desktop.in.in
- nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
- 
-@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_
- 	done
- 
- appdatadir = $(datadir)/appdata
--appdata_in_files = gnome-terminal.appdata.xml.in
-+appdata_in_files = org.gnome.Terminal.appdata.xml.in
- nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- @INTLTOOL_XML_RULE@
- 
-diff -rupN gnome-terminal-3.17.91/configure.ac gnome-terminal-3.17.91-patched/configure.ac
---- gnome-terminal-3.17.91/configure.ac	2015-08-20 16:22:06.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/configure.ac	2015-09-15 23:32:53.534366550 +0200
-@@ -353,7 +353,7 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLO
- 
- AC_CONFIG_FILES([
- Makefile
--gnome-terminal.desktop.in
-+org.gnome.Terminal.desktop.in
- src/Makefile
- src/terminal-version.h
- help/Makefile
-diff -rupN gnome-terminal-3.17.91/gnome-terminal.appdata.xml.in gnome-terminal-3.17.91-patched/gnome-terminal.appdata.xml.in
---- gnome-terminal-3.17.91/gnome-terminal.appdata.xml.in	2014-09-23 20:15:22.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/gnome-terminal.appdata.xml.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,38 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!--
--  Copyright © 2014 Christian Persch
--
--  This program is free software; you can redistribute it and/or modify
--  it under the terms of the GNU General Public License as published by
--  the Free Software Foundation; either version 3, or (at your option)
--  any later version.
--
--  This program is distributed in the hope conf it will be useful,
--  but WITHOUT ANY WARRANTY; without even the implied warranty of
--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--  GNU General Public License for more details.
--
--  You should have received a copy of the GNU General Public License
--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
---->
--<!-- FIXME: the xmlns for appdata is made-up -->
--<application
--  xmlns="https://www.freedesktop.org/standards/appdata/1.0"
--  xmlns:xi="http://www.w3.org/2001/XInclude"
--  xmlns:its="http://www.w3.org/2005/11/its">
--  <id type="desktop">gnome-terminal.desktop</id>
--  <metadata_license>GPL-3.0+</metadata_license>
--  <project_license>GPL-3.0+</project_license>
--  <_name>Terminal</_name>
--  <_summary>Use the command line</_summary>
--  <description>
--    <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
--    <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
--  </description>
--  <screenshots>
--    <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
--  </screenshots>
--  <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
--  <project_group>GNOME</project_group>
--  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
--</application>
-diff -rupN gnome-terminal-3.17.91/gnome-terminal.desktop.in.in gnome-terminal-3.17.91-patched/gnome-terminal.desktop.in.in
---- gnome-terminal-3.17.91/gnome-terminal.desktop.in.in	2015-06-24 10:41:30.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/gnome-terminal.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,16 +0,0 @@
--[Desktop Entry]
--_Name=Terminal
--_Comment=Use the command line
--_Keywords=shell;prompt;command;commandline;cmd;
--TryExec=gnome-terminal
--Exec=gnome-terminal
--Icon=utilities-terminal
--Type=Application
--X-GNOME-DocPath=gnome-terminal/index.html
--X-GNOME-Bugzilla-Bugzilla=GNOME
--X-GNOME-Bugzilla-Product=gnome-terminal
--X-GNOME-Bugzilla-Component=BugBuddyBugs
--X-GNOME-Bugzilla-Version=@VERSION@
--Categories=GNOME;GTK;System;TerminalEmulator;
--StartupNotify=true
--X-GNOME-SingleWindow=false
-diff -rupN gnome-terminal-3.17.91/org.gnome.Terminal.appdata.xml.in gnome-terminal-3.17.91-patched/org.gnome.Terminal.appdata.xml.in
---- gnome-terminal-3.17.91/org.gnome.Terminal.appdata.xml.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-terminal-3.17.91-patched/org.gnome.Terminal.appdata.xml.in	2014-09-23 20:15:22.000000000 +0200
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!--
-+  Copyright © 2014 Christian Persch
-+
-+  This program is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 3, or (at your option)
-+  any later version.
-+
-+  This program is distributed in the hope conf it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+-->
-+<!-- FIXME: the xmlns for appdata is made-up -->
-+<application
-+  xmlns="https://www.freedesktop.org/standards/appdata/1.0"
-+  xmlns:xi="http://www.w3.org/2001/XInclude"
-+  xmlns:its="http://www.w3.org/2005/11/its">
-+  <id type="desktop">gnome-terminal.desktop</id>
-+  <metadata_license>GPL-3.0+</metadata_license>
-+  <project_license>GPL-3.0+</project_license>
-+  <_name>Terminal</_name>
-+  <_summary>Use the command line</_summary>
-+  <description>
-+    <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
-+    <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
-+  </description>
-+  <screenshots>
-+    <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
-+  </screenshots>
-+  <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
-+  <project_group>GNOME</project_group>
-+  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
-+</application>
-diff -rupN gnome-terminal-3.17.91/org.gnome.Terminal.desktop.in.in gnome-terminal-3.17.91-patched/org.gnome.Terminal.desktop.in.in
---- gnome-terminal-3.17.91/org.gnome.Terminal.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-terminal-3.17.91-patched/org.gnome.Terminal.desktop.in.in	2015-06-24 10:41:30.000000000 +0200
-@@ -0,0 +1,16 @@
-+[Desktop Entry]
-+_Name=Terminal
-+_Comment=Use the command line
-+_Keywords=shell;prompt;command;commandline;cmd;
-+TryExec=gnome-terminal
-+Exec=gnome-terminal
-+Icon=utilities-terminal
-+Type=Application
-+X-GNOME-DocPath=gnome-terminal/index.html
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gnome-terminal
-+X-GNOME-Bugzilla-Component=BugBuddyBugs
-+X-GNOME-Bugzilla-Version=@VERSION@
-+Categories=GNOME;GTK;System;TerminalEmulator;
-+StartupNotify=true
-+X-GNOME-SingleWindow=false
-diff -rupN gnome-terminal-3.17.91/po/POTFILES.in gnome-terminal-3.17.91-patched/po/POTFILES.in
---- gnome-terminal-3.17.91/po/POTFILES.in	2015-06-24 10:41:31.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/po/POTFILES.in	2015-09-15 23:35:25.378320322 +0200
-@@ -1,8 +1,8 @@
- [encoding: UTF-8]
- # List of source files containing translatable strings.
- # Please keep this file sorted alphabetically.
--gnome-terminal.appdata.xml.in
--gnome-terminal.desktop.in.in
-+org.gnome.Terminal.appdata.xml.in
-+org.gnome.Terminal.desktop.in.in
- [type: gettext/glade]src/find-dialog.ui
- src/gterminal.vala
- src/migration.c
-diff -rupN gnome-terminal-3.17.91/po/POTFILES.skip gnome-terminal-3.17.91-patched/po/POTFILES.skip
---- gnome-terminal-3.17.91/po/POTFILES.skip	2014-09-23 20:15:23.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/po/POTFILES.skip	2015-09-15 23:35:45.295069245 +0200
-@@ -1,4 +1,4 @@
- # List of source files that should *not* be translated.
- # Please keep this file sorted alphabetically.
--gnome-terminal.desktop.in
-+org.gnome.Terminal.desktop.in
- src/gterminal.c
-diff -rupN gnome-terminal-3.17.91/src/gnome-terminal-search-provider.ini gnome-terminal-3.17.91-patched/src/gnome-terminal-search-provider.ini
---- gnome-terminal-3.17.91/src/gnome-terminal-search-provider.ini	2014-04-07 09:40:19.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/gnome-terminal-search-provider.ini	2015-09-15 23:36:47.675328007 +0200
-@@ -14,7 +14,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- [Shell Search Provider]
--DesktopId=gnome-terminal.desktop
-+DesktopId=org.gnome.Terminal.desktop
- BusName=org.gnome.Terminal
- ObjectPath=/org/gnome/Terminal/SearchProvider
- Version=2
-diff -rupN gnome-terminal-3.17.91/src/terminal-app.c gnome-terminal-3.17.91-patched/src/terminal-app.c
---- gnome-terminal-3.17.91/src/terminal-app.c	2015-07-14 19:37:28.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/terminal-app.c	2015-09-15 23:22:06.101721406 +0200
+From 6794273920bc690c2403938c101d1ed2ae33359b Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 27 Jan 2015 18:40:13 +0100
+Subject: [PATCH 1/3] Support desktop notifications from OSC 777
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711059
+---
+ src/terminal-app.c       |  32 ++++++++++++++
+ src/terminal-screen.c    | 108 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/terminal-tab-label.c |  28 +++++++++++-
+ src/terminal-tab-label.h |   4 ++
+ 4 files changed, 171 insertions(+), 1 deletion(-)
+
+diff --git a/src/terminal-app.c b/src/terminal-app.c
+index 0d2a0e61786e..a068c3673971 100644
+--- a/src/terminal-app.c
++++ b/src/terminal-app.c
 @@ -353,6 +353,31 @@ app_menu_quit_cb (GSimpleAction *action,
      gtk_widget_destroy (GTK_WIDGET (window));
  }
@@ -225,7 +47,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-app.c gnome-terminal-3.17.91-patc
  /* Class implementation */
  
  G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION)
-@@ -375,6 +400,10 @@ terminal_app_startup (GApplication *appl
+@@ -375,6 +400,10 @@ terminal_app_startup (GApplication *application)
      { "quit",        app_menu_quit_cb,          NULL, NULL, NULL }
    };
  
@@ -236,43 +58,20 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-app.c gnome-terminal-3.17.91-patc
    g_application_set_resource_base_path (application, TERMINAL_RESOURCES_PATH_PREFIX);
  
    G_APPLICATION_CLASS (terminal_app_parent_class)->startup (application);
-@@ -386,6 +415,9 @@ terminal_app_startup (GApplication *appl
+@@ -385,6 +414,9 @@ terminal_app_startup (GApplication *application)
+   g_action_map_add_action_entries (G_ACTION_MAP (application),
                                     app_menu_actions, G_N_ELEMENTS (app_menu_actions),
                                     application);
- 
 +  g_action_map_add_action_entries (G_ACTION_MAP (application),
 +                                   other_actions, G_N_ELEMENTS (other_actions),
 +                                   application);
  
-   app_load_css (application);
- 
-diff -rupN gnome-terminal-3.17.91/src/terminal-debug.c gnome-terminal-3.17.91-patched/src/terminal-debug.c
---- gnome-terminal-3.17.91/src/terminal-debug.c	2014-09-23 20:15:23.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/terminal-debug.c	2015-09-15 23:37:46.958908703 +0200
-@@ -38,6 +38,7 @@ _terminal_debug_init(void)
-     { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST },
-     { "appmenu",       TERMINAL_DEBUG_APPMENU       },
-     { "search",        TERMINAL_DEBUG_SEARCH        },
-+    { "notifications", TERMINAL_DEBUG_NOTIFICATIONS },
-   };
- 
-   _terminal_debug_flags = g_parse_debug_string (g_getenv ("GNOME_TERMINAL_DEBUG"),
-diff -rupN gnome-terminal-3.17.91/src/terminal-debug.h gnome-terminal-3.17.91-patched/src/terminal-debug.h
---- gnome-terminal-3.17.91/src/terminal-debug.h	2014-09-23 20:15:23.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/terminal-debug.h	2015-09-15 23:38:50.825843253 +0200
-@@ -34,7 +34,8 @@ typedef enum {
-   TERMINAL_DEBUG_PROFILE       = 1 << 6,
-   TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7,
-   TERMINAL_DEBUG_APPMENU       = 1 << 8,
--  TERMINAL_DEBUG_SEARCH        = 1 << 9
-+  TERMINAL_DEBUG_SEARCH        = 1 << 9,
-+  TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10
- } TerminalDebugFlags;
  
- void _terminal_debug_init(void);
-diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-patched/src/terminal-screen.c
---- gnome-terminal-3.17.91/src/terminal-screen.c	2015-08-13 13:41:18.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/terminal-screen.c	2015-09-15 23:41:35.219871666 +0200
+   app_load_css (application);
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index a48de105e953..fbc7d868d568 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
 @@ -52,6 +52,7 @@
  #include "terminal-marshal.h"
  #include "terminal-schemas.h"
@@ -289,7 +88,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
    int child_pid;
    GSList *match_tags;
    guint launch_child_source_id;
-@@ -135,11 +137,16 @@ static void terminal_screen_system_font_
+@@ -135,11 +137,16 @@ static void terminal_screen_system_font_changed_cb (GSettings *,
  static gboolean terminal_screen_popup_menu (GtkWidget *widget);
  static gboolean terminal_screen_button_press (GtkWidget *widget,
                                                GdkEventButton *event);
@@ -306,7 +105,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
  
  static void terminal_screen_window_title_changed      (VteTerminal *vte_terminal,
                                                         TerminalScreen *screen);
-@@ -448,6 +455,7 @@ terminal_screen_class_init (TerminalScre
+@@ -448,6 +455,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    object_class->get_property = terminal_screen_get_property;
    object_class->set_property = terminal_screen_set_property;
  
@@ -314,7 +113,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
    widget_class->realize = terminal_screen_realize;
    widget_class->style_updated = terminal_screen_style_updated;
    widget_class->drag_data_received = terminal_screen_drag_data_received;
-@@ -455,6 +463,7 @@ terminal_screen_class_init (TerminalScre
+@@ -455,6 +463,7 @@ terminal_screen_class_init (TerminalScreenClass *klass)
    widget_class->popup_menu = terminal_screen_popup_menu;
  
    terminal_class->child_exited = terminal_screen_child_exited;
@@ -322,7 +121,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
  
    signals[PROFILE_SET] =
      g_signal_new (I_("profile-set"),
-@@ -576,6 +585,10 @@ terminal_screen_dispose (GObject *object
+@@ -576,6 +585,10 @@ terminal_screen_dispose (GObject *object)
    TerminalScreen *screen = TERMINAL_SCREEN (object);
    TerminalScreenPrivate *priv = screen->priv;
    GtkSettings *settings;
@@ -333,7 +132,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
  
    settings = gtk_widget_get_settings (GTK_WIDGET (screen));
    g_signal_handlers_disconnect_matched (settings, G_SIGNAL_MATCH_DATA,
-@@ -1512,6 +1525,45 @@ terminal_screen_button_press (GtkWidget
+@@ -1512,6 +1525,43 @@ terminal_screen_button_press (GtkWidget      *widget,
    return FALSE;
  }
  
@@ -345,8 +144,6 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
 +  TerminalApp *app;
 +  TerminalWindow *window;
 +
-+  _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification withdrawn\n");
-+
 +  window = terminal_screen_get_window (screen);
 +  if (window != NULL)
 +    {
@@ -379,11 +176,10 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
  /**
   * terminal_screen_get_current_dir:
   * @screen:
-@@ -1612,6 +1664,68 @@ terminal_screen_child_exited (VteTermina
-     }
+@@ -1613,6 +1663,64 @@ terminal_screen_child_exited (VteTerminal *terminal,
  }
  
-+static void
+ static void
 +terminal_screen_notification_received (VteTerminal *terminal,
 +                                       const char  *summary,
 +                                       const char  *body)
@@ -392,8 +188,6 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
 +  TerminalScreenPrivate *priv = screen->priv;
 +  TerminalWindow *window;
 +
-+  _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body);
-+
 +  if (G_UNLIKELY (!priv->shell_prompt_shown))
 +    {
 +      priv->shell_prompt_shown = TRUE;
@@ -425,7 +219,6 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
 +          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), TRUE);
 +          terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
-+          _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n");
 +        }
 +    }
 +  else
@@ -441,16 +234,17 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-screen.c gnome-terminal-3.17.91-p
 +
 +      app = terminal_app_get ();
 +      g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
-+      _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n");
 +    }
 +}
 +
- static void
++static void
  terminal_screen_drag_data_received (GtkWidget        *widget,
                                      GdkDragContext   *context,
-diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.c gnome-terminal-3.17.91-patched/src/terminal-tab-label.c
---- gnome-terminal-3.17.91/src/terminal-tab-label.c	2015-07-14 19:37:28.000000000 +0200
-+++ gnome-terminal-3.17.91-patched/src/terminal-tab-label.c	2015-09-15 23:29:10.516816598 +0200
+                                     gint              x,
+diff --git a/src/terminal-tab-label.c b/src/terminal-tab-label.c
+index cdd73d0653be..d6909a13ca65 100644
+--- a/src/terminal-tab-label.c
++++ b/src/terminal-tab-label.c
 @@ -34,6 +34,7 @@
  struct _TerminalTabLabelPrivate
  {
@@ -459,7 +253,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.c gnome-terminal-3.17.9
    GtkWidget *label;
    GtkWidget *close_button;
    gboolean bold;
-@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject
+@@ -179,7 +180,7 @@ terminal_tab_label_constructed (GObject *object)
  {
    TerminalTabLabel *tab_label = TERMINAL_TAB_LABEL (object);
    TerminalTabLabelPrivate *priv = tab_label->priv;
@@ -468,7 +262,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.c gnome-terminal-3.17.9
  
    G_OBJECT_CLASS (terminal_tab_label_parent_class)->constructed (object);
  
-@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject
+@@ -189,6 +190,10 @@ terminal_tab_label_constructed (GObject *object)
    
    gtk_box_set_spacing (GTK_BOX (hbox), SPACING);
  
@@ -479,7 +273,7 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.c gnome-terminal-3.17.9
    priv->label = label = gtk_label_new (NULL);
    gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
    gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTab
+@@ -377,6 +382,27 @@ terminal_tab_label_set_bold (TerminalTabLabel *tab_label,
  }
  
  /**
@@ -507,10 +301,11 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.c gnome-terminal-3.17.9
   * terminal_tab_label_get_screen:
   * @tab_label: a #TerminalTabLabel
   *
-diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.h gnome-terminal-3.17.91-patched/src/terminal-tab-label.h
---- gnome-terminal-3.17.91/src/terminal-tab-label.h	2015-03-23 20:01:12.000000000 +0100
-+++ gnome-terminal-3.17.91-patched/src/terminal-tab-label.h	2015-09-15 23:29:55.503658141 +0200
-@@ -59,6 +59,10 @@ GtkWidget *     terminal_tab_label_new
+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
+@@ -59,6 +59,10 @@ GtkWidget *     terminal_tab_label_new        (TerminalScreen *screen);
  void            terminal_tab_label_set_bold   (TerminalTabLabel *tab_label,
                                                 gboolean bold);
  
@@ -521,3 +316,322 @@ diff -rupN gnome-terminal-3.17.91/src/terminal-tab-label.h gnome-terminal-3.17.9
  TerminalScreen *terminal_tab_label_get_screen (TerminalTabLabel *tab_label);
  
  G_END_DECLS
+-- 
+2.1.0
+
+
+From 684f71a0548579304ec8283e17d073be243cba44 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Tue, 27 Jan 2015 19:04:19 +0100
+Subject: [PATCH 2/3] Make notifications based on org.gtk.Notification work
+
+The desktop file should be named after the application ID for this.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711059
+---
+ Makefile.am                            |  4 ++--
+ configure.ac                           |  2 +-
+ gnome-terminal.appdata.xml.in          | 38 ----------------------------------
+ gnome-terminal.desktop.in.in           | 16 --------------
+ org.gnome.Terminal.appdata.xml.in      | 38 ++++++++++++++++++++++++++++++++++
+ org.gnome.Terminal.desktop.in.in       | 16 ++++++++++++++
+ po/POTFILES.in                         |  4 ++--
+ po/POTFILES.skip                       |  2 +-
+ src/gnome-terminal-search-provider.ini |  2 +-
+ 9 files changed, 61 insertions(+), 61 deletions(-)
+ delete mode 100644 gnome-terminal.appdata.xml.in
+ delete mode 100644 gnome-terminal.desktop.in.in
+ create mode 100644 org.gnome.Terminal.appdata.xml.in
+ create mode 100644 org.gnome.Terminal.desktop.in.in
+
+diff --git a/Makefile.am b/Makefile.am
+index f6f41a6e2c73..3aa8677ed587 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
+ 	$(NULL)
+ 
+ desktopdir = $(datadir)/applications
+-desktop_in_files = @PACKAGE@.desktop.in.in
++desktop_in_files = org.gnome.Terminal.desktop.in.in
+ nodist_desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+@@ -25,7 +25,7 @@ desktop-file-validate: $(nodist_desktop_DATA)
+ 	done
+ 
+ appdatadir = $(datadir)/appdata
+-appdata_in_files = gnome-terminal.appdata.xml.in
++appdata_in_files = org.gnome.Terminal.appdata.xml.in
+ nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+ 
+diff --git a/configure.ac b/configure.ac
+index fcaf3df73ce7..0f04df152015 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -353,7 +353,7 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLOWED],[GDK_VERSION_[]AS_TR_SH([$GTK_MAX_A
+ 
+ AC_CONFIG_FILES([
+ Makefile
+-gnome-terminal.desktop.in
++org.gnome.Terminal.desktop.in
+ src/Makefile
+ src/terminal-version.h
+ help/Makefile
+diff --git a/gnome-terminal.appdata.xml.in b/gnome-terminal.appdata.xml.in
+deleted file mode 100644
+index 7ef61e967ae5..000000000000
+--- a/gnome-terminal.appdata.xml.in
++++ /dev/null
+@@ -1,38 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!--
+-  Copyright © 2014 Christian Persch
+-
+-  This program is free software; you can redistribute it and/or modify
+-  it under the terms of the GNU General Public License as published by
+-  the Free Software Foundation; either version 3, or (at your option)
+-  any later version.
+-
+-  This program is distributed in the hope conf it will be useful,
+-  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-  GNU General Public License for more details.
+-
+-  You should have received a copy of the GNU General Public License
+-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--->
+-<!-- FIXME: the xmlns for appdata is made-up -->
+-<application
+-  xmlns="https://www.freedesktop.org/standards/appdata/1.0"
+-  xmlns:xi="http://www.w3.org/2001/XInclude"
+-  xmlns:its="http://www.w3.org/2005/11/its">
+-  <id type="desktop">gnome-terminal.desktop</id>
+-  <metadata_license>GPL-3.0+</metadata_license>
+-  <project_license>GPL-3.0+</project_license>
+-  <_name>Terminal</_name>
+-  <_summary>Use the command line</_summary>
+-  <description>
+-    <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
+-    <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
+-  </description>
+-  <screenshots>
+-    <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
+-  </screenshots>
+-  <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
+-  <project_group>GNOME</project_group>
+-  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
+-</application>
+diff --git a/gnome-terminal.desktop.in.in b/gnome-terminal.desktop.in.in
+deleted file mode 100644
+index 98ad8f9fe083..000000000000
+--- a/gnome-terminal.desktop.in.in
++++ /dev/null
+@@ -1,16 +0,0 @@
+-[Desktop Entry]
+-_Name=Terminal
+-_Comment=Use the command line
+-_Keywords=shell;prompt;command;commandline;cmd;
+-TryExec=gnome-terminal
+-Exec=gnome-terminal
+-Icon=utilities-terminal
+-Type=Application
+-X-GNOME-DocPath=gnome-terminal/index.html
+-X-GNOME-Bugzilla-Bugzilla=GNOME
+-X-GNOME-Bugzilla-Product=gnome-terminal
+-X-GNOME-Bugzilla-Component=BugBuddyBugs
+-X-GNOME-Bugzilla-Version=@VERSION@
+-Categories=GNOME;GTK;System;TerminalEmulator;
+-StartupNotify=true
+-X-GNOME-SingleWindow=false
+diff --git a/org.gnome.Terminal.appdata.xml.in b/org.gnome.Terminal.appdata.xml.in
+new file mode 100644
+index 000000000000..ab4f23b8329a
+--- /dev/null
++++ b/org.gnome.Terminal.appdata.xml.in
+@@ -0,0 +1,38 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!--
++  Copyright © 2014 Christian Persch
++
++  This program is free software; you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation; either version 3, or (at your option)
++  any later version.
++
++  This program is distributed in the hope conf it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License
++  along with this program.  If not, see <http://www.gnu.org/licenses/>.
++-->
++<!-- FIXME: the xmlns for appdata is made-up -->
++<application
++  xmlns="https://www.freedesktop.org/standards/appdata/1.0"
++  xmlns:xi="http://www.w3.org/2001/XInclude"
++  xmlns:its="http://www.w3.org/2005/11/its">
++  <id type="desktop">org.gnome.Terminal.desktop</id>
++  <metadata_license>GPL-3.0+</metadata_license>
++  <project_license>GPL-3.0+</project_license>
++  <_name>Terminal</_name>
++  <_summary>Use the command line</_summary>
++  <description>
++    <_p>GNOME Terminal is a terminal emulator application for accessing a UNIX shell environment which can be used to run programs available on your system.</_p>
++    <_p>It supports several profiles, multiple tabs and implements several keyboard shortcuts.</_p>
++  </description>
++  <screenshots>
++    <screenshot type="default">https://help.gnome.org/users/gnome-terminal/stable/figures/gnome-terminal.png</screenshot>
++  </screenshots>
++  <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
++  <project_group>GNOME</project_group>
++  <updatecontact>https://wiki.gnome.org/Apps/Terminal/ReportingBugs</updatecontact>
++</application>
+diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in
+new file mode 100644
+index 000000000000..98ad8f9fe083
+--- /dev/null
++++ b/org.gnome.Terminal.desktop.in.in
+@@ -0,0 +1,16 @@
++[Desktop Entry]
++_Name=Terminal
++_Comment=Use the command line
++_Keywords=shell;prompt;command;commandline;cmd;
++TryExec=gnome-terminal
++Exec=gnome-terminal
++Icon=utilities-terminal
++Type=Application
++X-GNOME-DocPath=gnome-terminal/index.html
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=gnome-terminal
++X-GNOME-Bugzilla-Component=BugBuddyBugs
++X-GNOME-Bugzilla-Version=@VERSION@
++Categories=GNOME;GTK;System;TerminalEmulator;
++StartupNotify=true
++X-GNOME-SingleWindow=false
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index dcbc5fe2c5aa..ae304cdfbbe1 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,8 +1,8 @@
+ [encoding: UTF-8]
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+-gnome-terminal.appdata.xml.in
+-gnome-terminal.desktop.in.in
++org.gnome.Terminal.appdata.xml.in
++org.gnome.Terminal.desktop.in.in
+ [type: gettext/glade]src/find-dialog.ui
+ src/gterminal.vala
+ src/migration.c
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 7c37b7fc2ca7..ef7c63561d4b 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,4 +1,4 @@
+ # List of source files that should *not* be translated.
+ # Please keep this file sorted alphabetically.
+-gnome-terminal.desktop.in
++org.gnome.Terminal.desktop.in
+ src/gterminal.c
+diff --git a/src/gnome-terminal-search-provider.ini b/src/gnome-terminal-search-provider.ini
+index b6506f299f1d..1b9f81c10fcf 100644
+--- a/src/gnome-terminal-search-provider.ini
++++ b/src/gnome-terminal-search-provider.ini
+@@ -14,7 +14,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ [Shell Search Provider]
+-DesktopId=gnome-terminal.desktop
++DesktopId=org.gnome.Terminal.desktop
+ BusName=org.gnome.Terminal
+ ObjectPath=/org/gnome/Terminal/SearchProvider
+ Version=2
+-- 
+2.1.0
+
+
+From ac22ab8ab4d12d051f0e371c8a405d7568db50dd Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Thu, 29 Jan 2015 11:47:21 +0100
+Subject: [PATCH 3/3] Sprinkle debug messages for notifications
+
+This can be useful for finding out whether the escape sequence wasn't
+emitted or the filtering was faulty.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711059
+---
+ src/terminal-debug.c  | 1 +
+ src/terminal-debug.h  | 3 ++-
+ src/terminal-screen.c | 6 ++++++
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/terminal-debug.c b/src/terminal-debug.c
+index 0ff321f1f0e2..dac79c38d82b 100644
+--- a/src/terminal-debug.c
++++ b/src/terminal-debug.c
+@@ -38,6 +38,7 @@ _terminal_debug_init(void)
+     { "settings-list", TERMINAL_DEBUG_SETTINGS_LIST },
+     { "appmenu",       TERMINAL_DEBUG_APPMENU       },
+     { "search",        TERMINAL_DEBUG_SEARCH        },
++    { "notifications", TERMINAL_DEBUG_NOTIFICATIONS },
+   };
+ 
+   _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 5dc3ca4f3df0..7499ebe06c88 100644
+--- a/src/terminal-debug.h
++++ b/src/terminal-debug.h
+@@ -34,7 +34,8 @@ typedef enum {
+   TERMINAL_DEBUG_PROFILE       = 1 << 6,
+   TERMINAL_DEBUG_SETTINGS_LIST = 1 << 7,
+   TERMINAL_DEBUG_APPMENU       = 1 << 8,
+-  TERMINAL_DEBUG_SEARCH        = 1 << 9
++  TERMINAL_DEBUG_SEARCH        = 1 << 9,
++  TERMINAL_DEBUG_NOTIFICATIONS = 1 << 10
+ } TerminalDebugFlags;
+ 
+ void _terminal_debug_init(void);
+diff --git a/src/terminal-screen.c b/src/terminal-screen.c
+index fbc7d868d568..f95ad2748e83 100644
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -1533,6 +1533,8 @@ terminal_screen_focus_in (GtkWidget     *widget,
+   TerminalApp *app;
+   TerminalWindow *window;
+ 
++  _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification withdrawn\n");
++
+   window = terminal_screen_get_window (screen);
+   if (window != NULL)
+     {
+@@ -1671,6 +1673,8 @@ terminal_screen_notification_received (VteTerminal *terminal,
+   TerminalScreenPrivate *priv = screen->priv;
+   TerminalWindow *window;
+ 
++  _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notification received: [%s]: %s\n", summary, body);
++
+   if (G_UNLIKELY (!priv->shell_prompt_shown))
+     {
+       priv->shell_prompt_shown = TRUE;
+@@ -1702,6 +1706,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
+           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), TRUE);
+           terminal_tab_label_set_icon (TERMINAL_TAB_LABEL (tab_label), "dialog-information-symbolic", summary);
++          _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify tab\n");
+         }
+     }
+   else
+@@ -1717,6 +1722,7 @@ terminal_screen_notification_received (VteTerminal *terminal,
+ 
+       app = terminal_app_get ();
+       g_application_send_notification (G_APPLICATION (app), priv->uuid, notification);
++      _terminal_debug_print (TERMINAL_DEBUG_NOTIFICATIONS, "Notify desktop\n");
+     }
+ }
+ 
+-- 
+2.1.0
+
diff --git a/gnome-terminal-fedora.install b/gnome-terminal-fedora.install
index 6e86c71c8ce0..260d56cb2f7d 100644
--- a/gnome-terminal-fedora.install
+++ b/gnome-terminal-fedora.install
@@ -11,4 +11,3 @@ pre_upgrade() {
 post_upgrade() {
   post_install $1
 }
-
diff --git a/gnome-terminal-restore-dark-transparency.patch b/gnome-terminal-restore-dark-transparency.patch
index f38a21e251ac..5c186c2bbcc0 100644
--- a/gnome-terminal-restore-dark-transparency.patch
+++ b/gnome-terminal-restore-dark-transparency.patch
@@ -1,4 +1,4 @@
-From a63d59c288545a8199334e78f1ed1e99d9c58d57 Mon Sep 17 00:00:00 2001
+From 0a97a742fc4153caa76548e075cb731e96376a67 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Mon, 12 May 2014 14:57:18 +0200
 Subject: [PATCH 1/5] Restore transparency
@@ -269,7 +269,7 @@ index e065ac1de49d..a146a62fb098 100644
 2.1.0
 
 
-From 3343f7710e0cdbb6c5b8fbed5316e176becb09e8 Mon Sep 17 00:00:00 2001
+From 9461b958aaf6bf40afa389850fc56cd087320a43 Mon Sep 17 00:00:00 2001
 From: Lars Uebernickel <lars.uebernickel@canonical.com>
 Date: Wed, 28 May 2014 14:11:02 +0200
 Subject: [PATCH 2/5] window: Make the drawing robust across all themes
@@ -331,7 +331,7 @@ index a146a62fb098..5117c06653c0 100644
 2.1.0
 
 
-From 7e4d713503e5105a4bb8149c5e73a444b5726303 Mon Sep 17 00:00:00 2001
+From c1efbc4c8a1d018f3724a2ca494ea5b543130612 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 17 Feb 2015 13:22:11 +0100
 Subject: [PATCH 3/5] Revert "prefs: Remove dark theme pref"
@@ -453,7 +453,7 @@ index e35990d728dc..d4f44d2f538e 100644
 2.1.0
 
 
-From b68a180427249e040ec1ced6461b5ce5dfab5d04 Mon Sep 17 00:00:00 2001
+From 4e92b51530a182aaf87a7b3ca8e1292078c86093 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 17 Feb 2015 13:22:21 +0100
 Subject: [PATCH 4/5] Revert "help: Remove dark theme pref"
@@ -528,7 +528,7 @@ index e3ca62732cf6..4bacc91265de 100644
 2.1.0
 
 
-From 46fee8a5c659a36867cd97c80de9d4a257ed5c6b Mon Sep 17 00:00:00 2001
+From 59a5e9751c868bfedd1ca19994760d3cf3768487 Mon Sep 17 00:00:00 2001
 From: Debarshi Ray <debarshir@gnome.org>
 Date: Tue, 17 Feb 2015 17:06:17 +0100
 Subject: [PATCH 5/5] Restore translations for dark terminals and transparency
@@ -580,7 +580,7 @@ Subject: [PATCH 5/5] Restore translations for dark terminals and transparency
  po/ko.po          | 11 +++++++----
  po/ku.po          |  4 ++--
  po/lt.po          | 11 +++++++----
- po/lv.po          |  4 ++--
+ po/lv.po          |  3 +++
  po/mai.po         |  4 ++--
  po/mg.po          |  4 ++--
  po/mk.po          |  4 ++--
@@ -623,7 +623,7 @@ Subject: [PATCH 5/5] Restore translations for dark terminals and transparency
  po/zh_CN.po       | 11 +++++++----
  po/zh_HK.po       |  3 +++
  po/zh_TW.po       | 11 +++++++----
- 89 files changed, 327 insertions(+), 216 deletions(-)
+ 89 files changed, 328 insertions(+), 214 deletions(-)
 
 diff --git a/po/am.po b/po/am.po
 index 27a7e9640668..04a8ad9f36a3 100644
@@ -838,10 +838,10 @@ index 0739e201f83b..8b1ff006857a 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 74b7d0beee7d..ec1b391c2a7a 100644
+index f420e1cdbbff..217b176092a9 100644
 --- a/po/da.po
 +++ b/po/da.po
-@@ -2083,11 +2083,11 @@ msgstr "_Luk vindue"
+@@ -2094,11 +2094,11 @@ msgstr "_Luk vindue"
  #~ msgid "Missing command"
  #~ msgstr "Manglende kommando"
  
@@ -857,7 +857,7 @@ index 74b7d0beee7d..ec1b391c2a7a 100644
  
  #~ msgid "COMMAND"
  #~ msgstr "KOMMANDO"
-@@ -2987,8 +2987,8 @@ msgstr "_Luk vindue"
+@@ -2999,8 +2999,8 @@ msgstr "_Luk vindue"
  #~ msgid "_Solid color"
  #~ msgstr "_Ensfarvet"
  
@@ -869,10 +869,10 @@ index 74b7d0beee7d..ec1b391c2a7a 100644
  #~ msgid ""
  #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/de.po b/po/de.po
-index 0d46e223c669..4101ba2c6eef 100644
+index 7fbad63bb009..9d376b53eec9 100644
 --- a/po/de.po
 +++ b/po/de.po
-@@ -2125,11 +2125,11 @@ msgstr "Fenster _schließen"
+@@ -2134,11 +2134,11 @@ msgstr "Fenster _schließen"
  #~ msgid "Missing command"
  #~ msgstr "Fehlender Befehl"
  
@@ -888,7 +888,7 @@ index 0d46e223c669..4101ba2c6eef 100644
  
  #~ msgid "Set the terminal title"
  #~ msgstr "Den Titel des Terminals festlegen"
-@@ -3057,8 +3057,8 @@ msgstr "Fenster _schließen"
+@@ -3066,8 +3066,8 @@ msgstr "Fenster _schließen"
  #~ msgid "Background image _scrolls"
  #~ msgstr "Hintergrundbild _folgt Bildlauf"
  
@@ -915,10 +915,10 @@ index ecb8fd59329c..290934ad3e0f 100644
  #: ../src/profile-preferences.glade.h:78
  #, fuzzy
 diff --git a/po/el.po b/po/el.po
-index b81802c913a5..573a99bb52ef 100644
+index 587527cb7a99..b0dbdd2a60a7 100644
 --- a/po/el.po
 +++ b/po/el.po
-@@ -2121,11 +2121,11 @@ msgstr "Κ_λείσιμο παραθύρου"
+@@ -2128,11 +2128,11 @@ msgstr "Κ_λείσιμο παραθύρου"
  #~ msgid "Missing command"
  #~ msgstr "Λείπει εντολή"
  
@@ -934,7 +934,7 @@ index b81802c913a5..573a99bb52ef 100644
  
  #~ msgid "_Use the system fixed width font"
  #~ msgstr "_Χρήση της γραμματοσειράς σταθερού πλάτους του συστήματος"
-@@ -2289,3 +2289,6 @@ msgstr "Κ_λείσιμο παραθύρου"
+@@ -2296,3 +2296,6 @@ msgstr "Κ_λείσιμο παραθύρου"
  
  #~ msgid "_Input Methods"
  #~ msgstr "_Μέθοδοι εισαγωγής"
@@ -1060,13 +1060,13 @@ index 97bb9762528f..9e32fb740c57 100644
  #~ msgid ""
  #~ "You already have a profile called “%s”. Do you want to create another "
 diff --git a/po/fa.po b/po/fa.po
-index 2090863eddaf..b9a05af5c969 100644
+index 882aae98a939..93007dc7450c 100644
 --- a/po/fa.po
 +++ b/po/fa.po
-@@ -2027,3 +2027,6 @@ msgstr "ذخیره به نام..."
- #: ../src/terminal-window.c:3456
- msgid "_Title:"
- msgstr "_عنوان:"
+@@ -2239,3 +2239,6 @@ msgstr "_بستن پنجره"
+ 
+ #~ msgid "_Title:"
+ #~ msgstr "_عنوان:"
 +
 +msgid "Transparent background"
 +msgstr "پس‌زمینه‌ی شفاف"
@@ -1163,10 +1163,10 @@ index 04a76e1de96a..4af1d80ececc 100644
 +msgid "Use _dark theme variant"
 +msgstr "Cleachd tionndadh _dorcha dhen ùrlar"
 diff --git a/po/gl.po b/po/gl.po
-index 1429c66bcaa5..584072278739 100644
+index ad9af1ba5ddc..bdbfa91fcf13 100644
 --- a/po/gl.po
 +++ b/po/gl.po
-@@ -2101,11 +2101,11 @@ msgstr "P_echar a xanela"
+@@ -2106,11 +2106,11 @@ msgstr "P_echar a xanela"
  #~ msgid "Missing command"
  #~ msgstr "Falta a orde"
  
@@ -1182,7 +1182,7 @@ index 1429c66bcaa5..584072278739 100644
  
  #~ msgid "_Use the system fixed width font"
  #~ msgstr "_Usar o tipo de letra de largura fixa do sistema"
-@@ -3055,8 +3055,8 @@ msgstr "P_echar a xanela"
+@@ -3060,8 +3060,8 @@ msgstr "P_echar a xanela"
  #~ msgid "Background image _scrolls"
  #~ msgstr "A imaxe de fondo _desprázase"
  
@@ -1312,35 +1312,35 @@ index 558490157ada..caadbba37c5d 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 346b5d815552..244844430503 100644
+index 595a325a574d..99c29b6d855b 100644
 --- a/po/id.po
 +++ b/po/id.po
-@@ -2068,3 +2068,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
+@@ -2058,3 +2058,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3694
  msgid "C_lose Window"
  msgstr "Tutup Jende_la"
 +
 +msgid "Transparent background"
 +msgstr "Latar belakang transparan"
 diff --git a/po/it.po b/po/it.po
-index 5a1847f3a108..2eb1d621e662 100644
+index 491303dfe349..af13ad9ca310 100644
 --- a/po/it.po
 +++ b/po/it.po
-@@ -2093,3 +2093,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "Chiudi _finestra"
+@@ -2105,3 +2105,6 @@ msgstr "Chiudi _finestra"
+ 
+ #~ msgid "_Update login records when command is launched"
+ #~ msgstr "_Aggiornare i record di login quando il comando viene eseguito"
 +
 +msgid "Transparent background"
 +msgstr "Sfondo trasparente"
 diff --git a/po/ja.po b/po/ja.po
-index 4f8f4dec0bb0..ce2ec952ca76 100644
+index f7235d9f4a0b..63d7fd7bb943 100644
 --- a/po/ja.po
 +++ b/po/ja.po
-@@ -1902,3 +1902,6 @@ msgstr "この端末には未だ実行中のプロセスが存在しています
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "ウィンドウを閉じる(_L)"
+@@ -1907,3 +1907,6 @@ msgstr "ウィンドウを閉じる(_L)"
+ 
+ #~ msgid "_Update login records when command is launched"
+ #~ msgstr "コマンドを実行した時にログイン記録を更新する(_U)"
 +
 +msgid "Transparent background"
 +msgstr "透過な画像にする"
@@ -1358,10 +1358,10 @@ index 8415e88f94ff..3717b7e75dcd 100644
  
  #: ../src/gnome-terminal.glade2.h:87
 diff --git a/po/kk.po b/po/kk.po
-index dba7503c4286..2961b87f3b2a 100644
+index ed86f1b70460..639411cfce86 100644
 --- a/po/kk.po
 +++ b/po/kk.po
-@@ -2019,14 +2019,17 @@ msgstr "Терезені жа_бу"
+@@ -2024,14 +2024,17 @@ msgstr "Терезені жа_бу"
  #~ msgid "Missing command"
  #~ msgstr "Команда жоқ болып тұр"
  
@@ -1395,10 +1395,10 @@ index c887f88a2c87..e899ef3ca8c1 100644
 +msgid "Transparent background"
 +msgstr "ಪಾರದರ್ಶಕ ಹಿನ್ನಲೆ"
 diff --git a/po/ko.po b/po/ko.po
-index 0700e25f9ec8..32914679e998 100644
+index 57c120389ac9..a41296a7fb0a 100644
 --- a/po/ko.po
 +++ b/po/ko.po
-@@ -2073,8 +2073,11 @@ msgstr "창 닫기(_L)"
+@@ -2079,8 +2079,11 @@ msgstr "창 닫기(_L)"
  #~ msgid "Missing command"
  #~ msgstr "명령어 없음"
  
@@ -1430,10 +1430,10 @@ index 221825b29cd9..96e35811337b 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 c906132e1a9e..dbe03e9abc8d 100644
+index 8c9c9e660d28..71411ab7cf5b 100644
 --- a/po/lt.po
 +++ b/po/lt.po
-@@ -2078,8 +2078,11 @@ msgstr "_Užverti langą"
+@@ -2085,8 +2085,11 @@ msgstr "_Užverti langą"
  #~ msgid "Missing command"
  #~ msgstr "Trūksta komandos"
  
@@ -1450,20 +1450,16 @@ index c906132e1a9e..dbe03e9abc8d 100644
 +msgid "Transparent background"
 +msgstr "Permatomas fonas"
 diff --git a/po/lv.po b/po/lv.po
-index a50f529c31b8..b29541fceb45 100644
+index 80a13ab6cac9..0360452e7b61 100644
 --- a/po/lv.po
 +++ b/po/lv.po
-@@ -3016,8 +3016,8 @@ msgstr "Aizvērt _logu"
- #~ msgid "Background image _scrolls"
- #~ msgstr "Fona attēla ritināšanā_s"
- 
--#~ msgid "_Transparent background"
--#~ msgstr "_Caurspīdīgs fons"
+@@ -2048,3 +2048,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3694
+ msgid "C_lose Window"
+ msgstr "Aizvērt _logu"
++
 +msgid "Transparent background"
 +msgstr "Caurspīdīgs fons"
- 
- #~ msgid "S_hade transparent or image background:"
- #~ msgstr "_Aizēnot caurspīdīgo vai attēla fonu:"
 diff --git a/po/mai.po b/po/mai.po
 index 9b984a068fda..a3c0e178ae67 100644
 --- a/po/mai.po
@@ -1698,10 +1694,10 @@ index 9c95b66e7185..5e5b8ba4f104 100644
  #~ msgid "S/Key Challenge Response"
  #~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ"
 diff --git a/po/pl.po b/po/pl.po
-index deb91b7d10bc..f7721713a0ca 100644
+index 609ffc36b5a4..f50b535b80fd 100644
 --- a/po/pl.po
 +++ b/po/pl.po
-@@ -2116,3 +2116,6 @@ msgid ""
+@@ -2106,3 +2106,6 @@ msgid ""
  msgstr ""
  "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza "
  "całkowitą przezroczystość."
@@ -1797,11 +1793,11 @@ index 179dd77fd166..f7fc7ae070cf 100644
  #: ../src/profile-preferences.glade.h:78
  msgid "_Underline color:"
 diff --git a/po/ru.po b/po/ru.po
-index cf87d021e781..7db31b8af3f1 100644
+index 1a6fbd95b4ba..4551e12f255b 100644
 --- a/po/ru.po
 +++ b/po/ru.po
-@@ -2056,3 +2056,6 @@ msgstr ""
- #: ../src/terminal-window.c:3656
+@@ -2065,3 +2065,6 @@ msgstr ""
+ #: ../src/terminal-window.c:3694
  msgid "C_lose Window"
  msgstr "_Закрыть окно"
 +
@@ -1863,10 +1859,10 @@ index 3a8ede3b61f4..b9744bc7c14c 100644
 +msgid "Transparent background"
 +msgstr "Priehľadné pozadie"
 diff --git a/po/sl.po b/po/sl.po
-index 782fd76c3563..247b87b021e4 100644
+index 72baf7b1e8ad..d7ff33ccfe8e 100644
 --- a/po/sl.po
 +++ b/po/sl.po
-@@ -2058,11 +2058,11 @@ msgstr "_Zapri okno"
+@@ -2066,11 +2066,11 @@ msgstr "_Zapri okno"
  #~ msgid "Missing command"
  #~ msgstr "Manjka ukaz"
  
@@ -1882,7 +1878,7 @@ index 782fd76c3563..247b87b021e4 100644
  
  #~ msgid "Set the terminal title"
  #~ msgstr "Nastavi naziv terminala"
-@@ -2314,3 +2314,6 @@ msgstr "_Zapri okno"
+@@ -2322,3 +2322,6 @@ msgstr "_Zapri okno"
  
  #~ msgid "_Profile Preferences…"
  #~ msgstr "Možnosti _profila ..."
@@ -1959,7 +1955,7 @@ index c82646ca4451..4ba3d9588643 100644
 +msgid "Transparent background"
 +msgstr "Providna pozadina"
 diff --git a/po/sv.po b/po/sv.po
-index ae8410940fce..eaae659d9ef3 100644
+index 745f7d985494..2cfce8bc6254 100644
 --- a/po/sv.po
 +++ b/po/sv.po
 @@ -2073,5 +2073,8 @@ msgstr "Stän_g fönster"
@@ -2053,11 +2049,11 @@ index f7a8d674657e..b0cc3a6014c2 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 02a704a93d49..78f26ba59dd7 100644
+index f7c68e62d9da..316587c0a7b2 100644
 --- a/po/tr.po
 +++ b/po/tr.po
-@@ -1968,3 +1968,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son
- #: ../src/terminal-window.c:3652
+@@ -1963,3 +1963,6 @@ msgstr "Hala bir süreç bu uçbirimde çalışıyor. Uçbirimi kapatmak onu son
+ #: ../src/terminal-window.c:3694
  msgid "C_lose Window"
  msgstr "_Pencereyi Kapat"
 +
@@ -2205,10 +2201,10 @@ index eb0ede77e889..aceb184b2440 100644
 +msgid "Transparent background"
 +msgstr "透明背景"
 diff --git a/po/zh_TW.po b/po/zh_TW.po
-index a32a53906a99..5d0ffa77f19f 100644
+index 8326ad3b0171..a9062135a180 100644
 --- a/po/zh_TW.po
 +++ b/po/zh_TW.po
-@@ -2029,11 +2029,11 @@ msgstr "關閉視窗(_L)"
+@@ -2034,11 +2034,11 @@ msgstr "關閉視窗(_L)"
  #~ msgid "Missing command"
  #~ msgstr "遺失指令"
  
@@ -2224,7 +2220,7 @@ index a32a53906a99..5d0ffa77f19f 100644
  
  #~ msgid "_Use the system fixed width font"
  #~ msgstr "使用系統的固定寬度字型(_U)"
-@@ -2379,3 +2379,6 @@ msgstr "關閉視窗(_L)"
+@@ -2383,3 +2383,6 @@ msgstr "關閉視窗(_L)"
  
  #~ msgid "Show session management options"
  #~ msgstr "顯示作業階段管理選項"
diff --git a/gnome-terminal-symbolic-new-tab-icon.patch b/gnome-terminal-symbolic-new-tab-icon.patch
new file mode 100644
index 000000000000..3d21c264255c
--- /dev/null
+++ b/gnome-terminal-symbolic-new-tab-icon.patch
@@ -0,0 +1,27 @@
+From 08405736ab32161a003a891a11efc0820245b4e5 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Tue, 29 Sep 2015 23:42:53 -0500
+Subject: [PATCH] window: Use a symbolic new tab icon
+
+https://developer.gnome.org/hig/3.18/icons-and-artwork.html.en
+
+https://bugzilla.gnome.org/show_bug.cgi?id=755825
+---
+ src/terminal-window.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index f673e99..6567196 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2195,7 +2195,7 @@ terminal_window_fill_notebook_action_box (TerminalWindow *window)
+   /* Create the NewTerminal button */
+   action = gtk_action_group_get_action (priv->action_group, "FileNewTab");
+ 
+-  button = terminal_icon_button_new ("list-add");
++  button = terminal_icon_button_new ("list-add-symbolic");
+   gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
+   gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+   gtk_widget_show (button);
+-- 
+2.4.3
author	Manuel Hüsers	2015-10-07 16:05:43 +0200
committer	Manuel Hüsers	2015-10-07 16:05:43 +0200
commit	ebe86eb5b081cf01a714ba9ea079cc2de1bbe4a1 (patch)
tree	31e48d2cfc573b0f2389c31a63ea9f28e0866f0f
parent	c96fa161525172b1045c801b49a00a4be64afba5 (diff)
download	aur-ebe86eb5b081cf01a714ba9ea079cc2de1bbe4a1.tar.gz