GTK updated.

- Menu of GtkMenuButton is displayed as popover only if GTK_CSD env variable doesn't exists.
- Fixes for GNOME developers mistake added.

25 files changed, 396 insertions, 366 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81ca20d7158f..bbe7933b37f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gtk3-mushrooms
 	pkgdesc = GTK3 library with my modifications (see README).
-	pkgver = 3.22.24
+	pkgver = 3.22.25
 	pkgrel = 1
 	url = http://www.gtk.org/
 	arch = i686
@@ -34,9 +34,8 @@ pkgbase = gtk3-mushrooms
 	optdepends = dconf: default GSettings backend
 	optdepends = adwaita-icon-theme: default icon theme
 	optdepends = cantarell-fonts: default font
-	provides = gtk3=3.22.24
+	provides = gtk3=3.22.25
 	conflicts = gtk3
-	source = do-mushrooms.sh
 	source = appearance__buttons-menus-icons.patch
 	source = appearance__file-chooser.patch
 	source = appearance__print-dialog.patch
@@ -57,33 +56,34 @@ pkgbase = gtk3-mushrooms
 	source = popovers__menu-button.patch
 	source = popovers__places-sidebar.patch
 	source = smaller-adwaita.css
-	source = https://download.gnome.org/sources/gtk+/3.22/gtk+-3.22.24.tar.xz
-	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=712b5a879d9389efba706c8817607fa65ac562e9
-	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=712b5a879d9389efba706c8817607fa65ac562e9
-	sha256sums = 69b8efb7b61089c4ca6328dcd910fd2a31075e1774d72463adb13e44e7ea8e86
-	sha256sums = da8b8cd33750d38c607b4a4c5ae5dab9bf61c58aca12a095dfe6f555d3c9cd79
-	sha256sums = b978504d311fb87505e1787a07c246310e3389840082f326e266193ad908c0f1
-	sha256sums = b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629
-	sha256sums = 7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac
-	sha256sums = 7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8
-	sha256sums = 58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb
-	sha256sums = a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494
-	sha256sums = 831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0
-	sha256sums = 90fcf8ed5a40b01a2cbc5e255c05860d9960b51dda704bacfe3efe23a1b045bc
-	sha256sums = 4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb
-	sha256sums = 9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9
-	sha256sums = fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f
-	sha256sums = dcbdf52343748b7af621e98bf12d8c76097e0eb98ef02f594f95eefc5ae72575
-	sha256sums = cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a
-	sha256sums = 4917fcb99dfe189f0f834a143bf85abb77f9ac0b8ec7a881aa4c8c1b897f6524
-	sha256sums = 64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace
-	sha256sums = e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171
-	sha256sums = 4a239fb3f4dc128a64198ce9bcb9c4643541e366fd3fe19dfb45d23711727e18
-	sha256sums = a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb
+	source = https://github.com/GNOME/gtk/archive/3.22.25.tar.gz
+	source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=9c134e81edd28eb5db10cd6b2129a5b9e42689fa
+	source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=9c134e81edd28eb5db10cd6b2129a5b9e42689fa
+	source = __fix-3.22.25-mistake.__patch::https://bug789630.bugzilla-attachments.gnome.org/attachment.cgi?id=362496
+	sha256sums = 68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb
+	sha256sums = 3d4d9cac36285e19972650a33bdba815096cb256e3f0991914ed3c8c19cfb650
+	sha256sums = be4ddf03a5cce8270e8118eb331b3056972c0bd490faa6e4a4ebe332ec4c2e91
+	sha256sums = 81138fbaff82e37a83da1c4aa074a6c708e6c50340e0ddeff3fb70e2a0b52e1f
+	sha256sums = 3367e93113c8ebc31244d57845c41b81e5e70a62b64faf61f216f3455d7020b5
+	sha256sums = 513f8d3092d8392898dbdffa57fb2e92a20ad1413161b71a2fe05ee3f5c3da58
+	sha256sums = 4eb430f3375b3cf50ec919b868ebff3f50a6a72f40cfaf46e6ccdfc3586833e7
+	sha256sums = d3816c145d4e0bc3fe04904434b2e2cae5a04d5691693d6b0c86391f76a5bf6a
+	sha256sums = 37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd
+	sha256sums = f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791
+	sha256sums = 0cd2cd0365cb532d25ef4587882062f230dfb09f36485c568bdf27c8534831b2
+	sha256sums = 7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672
+	sha256sums = 99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b
+	sha256sums = c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071
+	sha256sums = 3067face12ad74d664ab7951f59026c01eb8070bef007b522eb84aef1576674a
+	sha256sums = 7f3e5da1622e243243ea9b1e487460f608dc375e79d800d2f0d826fd30be68ed
+	sha256sums = ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54
+	sha256sums = fe421b6197b4e98254019896ec79ea6b29a2140e7950ce3018ae0e1e4047b0c0
+	sha256sums = 2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac
 	sha256sums = 0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5
-	sha256sums = cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b
+	sha256sums = d72da94dcd208a8a76ad156247e3453bde308555e767c41a303ffc28015b68bd
 	sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
 	sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
+	sha256sums = 37e6b2669c055f34a3264b71f748b08465de225f32ed4e1453deea12eafc0c05
 
 pkgname = gtk3-mushrooms
 
diff --git a/.gitignore b/.gitignore
index 2d628dbff618..39c600442b2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 pkg
 src
 *.tar.xz
+*.tar.gz
 gtk-query-immodules-3.0.hook
 settings.ini
diff --git a/PKGBUILD b/PKGBUILD
index 506522b90a57..971cfafb33f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 # This file is based on original PKGBUILD of GTK3 package.
 # https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
 
-_arch_pkg_commit="712b5a879d9389efba706c8817607fa65ac562e9"
+__arch_pkg_commit="9c134e81edd28eb5db10cd6b2129a5b9e42689fa"
 
 pkgname=gtk3-mushrooms
-pkgver=3.22.24
+pkgver=3.22.25
 pkgrel=1
 pkgdesc="GTK3 library with my modifications (see README)."
 url="http://www.gtk.org/"
@@ -19,19 +19,16 @@ depends=(
 	libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
 	json-glib librsvg wayland-protocols desktop-file-utils mesa gtk-update-icon-cache
 )
+makedepends=(
+	gobject-introspection libcanberra gtk-doc
+)
 optdepends=(
 	'gtk3-print-backends: printing'
 	'dconf: default GSettings backend'
 	'adwaita-icon-theme: default icon theme'
 	'cantarell-fonts: default font'
 )
-makedepends=(
-	gobject-introspection libcanberra gtk-doc
-)
 source=(
-	# Script applying patch.
-	"do-mushrooms.sh"
-
 	# Patch files.
 	"appearance__buttons-menus-icons.patch"
 	"appearance__file-chooser.patch"
@@ -57,50 +54,98 @@ source=(
 	"smaller-adwaita.css"
 
 	# GTK source code.
-	"https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
+	"https://github.com/GNOME/gtk/archive/$pkgver.tar.gz"
 
 	# ArchLinux package files.
-	"settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$_arch_pkg_commit"
-	"gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=$_arch_pkg_commit"
+	"settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=$__arch_pkg_commit"
+	"gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=$__arch_pkg_commit"
+
+	# Fix Makefile mistake — https://bugzilla.gnome.org/show_bug.cgi?id=789630.
+	"__fix-3.22.25-mistake.__patch::https://bug789630.bugzilla-attachments.gnome.org/attachment.cgi?id=362496"
 )
 sha256sums=(
-	'69b8efb7b61089c4ca6328dcd910fd2a31075e1774d72463adb13e44e7ea8e86'
-	'da8b8cd33750d38c607b4a4c5ae5dab9bf61c58aca12a095dfe6f555d3c9cd79'
-	'b978504d311fb87505e1787a07c246310e3389840082f326e266193ad908c0f1'
-	'b479fe0a82db21475fde30d9daad4360552b67957479773a1216058c7ff46629'
-	'7908611ae7f85a37542b1f1558f46f1d5f35fa1996551d4e61c163569ea3b0ac'
-	'7a1f4259502eea2f610df3ed8f82fc929fce1ebe92422327f54aa41ddf47e7f8'
-	'58eb8466a76d6d48f32ec77365dc5436334e2aab9dd9df3ab59d5d55beb591cb'
-	'a97f8b588ccfd55e78bccbbfa55b3ca62d5e1732cc815852b31ba9a6fa722494'
-	'831e67a278152e93561658f364a10251ed07a9d05c60828b7ec1ab933ebe67b0'
-	'90fcf8ed5a40b01a2cbc5e255c05860d9960b51dda704bacfe3efe23a1b045bc'
-	'4d2fdb331e105c8512d3b2ad16b8c512b372fa3c3658c6881b1f89c9d78da7fb'
-	'9d07b362be00fa493642f680feeebc49cfae28f8f88c0e8c6de13b15323dacc9'
-	'fdc2c3d63c0fc94934c10a99189062955e8f40acd3bb883b739faefa86344c1f'
-	'dcbdf52343748b7af621e98bf12d8c76097e0eb98ef02f594f95eefc5ae72575'
-	'cf1e95e4a8c9d001d919fddeab9260b39e32739fe66440138dfc70182df5297a'
-	'4917fcb99dfe189f0f834a143bf85abb77f9ac0b8ec7a881aa4c8c1b897f6524'
-	'64776101101b0ddc256e32a318f35526eb5e41b48aba7b7d30c39ef76db77ace'
-	'e8d53849a3277fa0f0f729be2197970f28cd809070021d2f5ae1987df8250171'
-	'4a239fb3f4dc128a64198ce9bcb9c4643541e366fd3fe19dfb45d23711727e18'
-	'a55a56aeb72715cb6ae39e440e01ff7492e484400f6e063368b74abf59d44fdb'
-	'0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5'
-	'cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b'
-	'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
-	'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+	"68b26360764a2ea7e057a2aaa29c6fdfe164b9987866e038d8d0188a025477fb"
+	"3d4d9cac36285e19972650a33bdba815096cb256e3f0991914ed3c8c19cfb650"
+	"be4ddf03a5cce8270e8118eb331b3056972c0bd490faa6e4a4ebe332ec4c2e91"
+	"81138fbaff82e37a83da1c4aa074a6c708e6c50340e0ddeff3fb70e2a0b52e1f"
+	"3367e93113c8ebc31244d57845c41b81e5e70a62b64faf61f216f3455d7020b5"
+	"513f8d3092d8392898dbdffa57fb2e92a20ad1413161b71a2fe05ee3f5c3da58"
+	"4eb430f3375b3cf50ec919b868ebff3f50a6a72f40cfaf46e6ccdfc3586833e7"
+	"d3816c145d4e0bc3fe04904434b2e2cae5a04d5691693d6b0c86391f76a5bf6a"
+	"37e3278dd33542b706eb9e1db56997b194a7e2f1fd729a8511369387a74b22bd"
+	"f0c8cbccab2bc9743075135bd5fa74f28dca722e8e723cf46e0dfa2b004a3791"
+	"0cd2cd0365cb532d25ef4587882062f230dfb09f36485c568bdf27c8534831b2"
+	"7b987cc9bd7ca9722bfb881b30b082c0d7409e3cd68592f5e7a1f401d73e7672"
+	"99b12d7af7efc6a014e6afcab1ee82ea0feb0b5a4e9bbd663d1c45354cd34f2b"
+	"c213812e1fafeb5565f7e329c4501195f04adcfe377b88439a6d51d478edc071"
+	"3067face12ad74d664ab7951f59026c01eb8070bef007b522eb84aef1576674a"
+	"7f3e5da1622e243243ea9b1e487460f608dc375e79d800d2f0d826fd30be68ed"
+	"ef4fed3a364db8eb9c15c9ce0e733035722f168dc88b385df2178fc1168ada54"
+	"fe421b6197b4e98254019896ec79ea6b29a2140e7950ce3018ae0e1e4047b0c0"
+	"2de68b575494d0d034accd7cd0ce881f366d5201a48496d8748c43f297836eac"
+	"0554ba2085fb8cec8e3b926efc250ae5c15cf47f2612c10cdd0e849bfb8d05a5"
+	"d72da94dcd208a8a76ad156247e3453bde308555e767c41a303ffc28015b68bd"
+	"01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202"
+	"de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845"
+	"37e6b2669c055f34a3264b71f748b08465de225f32ed4e1453deea12eafc0c05"
 )
 
+__patch_makefiles()
+{
+	__replace_string_in_file()
+	{
+		sed -i".bak" "s/$1/$2/" "$3"
+		rm "$3.bak"
+	}
+
+	__replace_string_in_file \
+		"SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples" \
+		"SRC_SUBDIRS = gdk gtk libgail-util modules demos" \
+		"Makefile.am"
+
+	__replace_string_in_file \
+		"SUBDIRS = po po-properties \$(SRC_SUBDIRS) docs m4macros build" \
+		"SUBDIRS = po \$(SRC_SUBDIRS) m4macros build" \
+		"Makefile.am"
+
+	__replace_string_in_file \
+		"SUBDIRS = gtk-demo widget-factory icon-browser" \
+		"SUBDIRS = widget-factory" \
+		"demos/Makefile.am"
+
+	__replace_string_in_file "SUBDIRS += cloudprint" "" "modules/printbackends/Makefile.am"
+	__replace_string_in_file "SUBDIRS += cups" 	     "" "modules/printbackends/Makefile.am"
+	__replace_string_in_file "gtk-update-icon-cache" "" "gtk/Makefile.am"
+}
+
+__patch_gtk_code()
+{
+	for patch_file in $srcdir/*.patch; do
+		patch -d "gtk" -p 3 -i "$patch_file"
+	done
+
+	cat "$srcdir/smaller-adwaita.css" | tee -a gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null
+}
+
 prepare()
 {
-	cd "$srcdir/gtk+-$pkgver"
+	cd "$srcdir/gtk-$pkgver"
+
+	# Fix Makefile mistake — https://bugzilla.gnome.org/show_bug.cgi?id=789630.
+	patch -p 1 -i "$srcdir/__fix-3.22.25-mistake.__patch"
+
+	# Make building faster by skipping tests, code examples and unused elements.
+	__patch_makefiles
+
+	# Apply patches to GTK code.
+	__patch_gtk_code
 
-	../do-mushrooms.sh
 	NOCONFIGURE=1 ./autogen.sh
 }
 
 build()
 {
-	cd "$srcdir/gtk+-$pkgver"
+	cd "$srcdir/gtk-$pkgver"
 
 	CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 		--enable-x11-backend --enable-wayland-backend --disable-schemas-compile --disable-gtk-doc-html
@@ -113,7 +158,7 @@ build()
 
 package()
 {
-	cd "$srcdir/gtk+-$pkgver"
+	cd "$srcdir/gtk-$pkgver"
 
 	make -j 15 DESTDIR="$pkgdir" install
 	install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
diff --git a/appearance__buttons-menus-icons.patch b/appearance__buttons-menus-icons.patch
index 7d2c9b2a9998..c38845c66194 100644
--- a/appearance__buttons-menus-icons.patch
+++ b/appearance__buttons-menus-icons.patch
@@ -1,57 +1,61 @@
-diff '--color=auto' -U 5 -r -Z -B ./org/gtk/gtkbutton.c ./mod/gtk/gtkbutton.c
---- ./org/gtk/gtkbutton.c	2017-08-22 12:22:29.000000000 +0200
-+++ ./mod/gtk/gtkbutton.c	2017-09-20 00:38:05.204450429 +0200
-@@ -2160,10 +2160,30 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkbutton.c ./mod/gtk/gtkbutton.c
+--- ./org/gtk/gtkbutton.c	2017-10-02 18:00:58.000000000 +0200
++++ ./mod/gtk/gtkbutton.c	2017-10-30 20:27:13.840160899 +0100
+@@ -2160,10 +2160,31 @@
    gchar *new_label;
-
+ 
    g_return_if_fail (GTK_IS_BUTTON (button));
-
+ 
    priv = button->priv;
-+  if (priv->image == NULL) {
-+    gchar *use_this_icon = NULL;
-+    if (g_strcmp0( label, _("_Select") ) == 0 || g_strcmp0( label, _("_OK") ) == 0) use_this_icon = "gtk-ok";
-+    else if (g_strcmp0( label, _("_Cancel") ) == 0)  use_this_icon = "gtk-cancel";
-+    else if (g_strcmp0( label, _("_Close") ) == 0)   use_this_icon = "gtk-close";
-+    else if (g_strcmp0( label, _("_Yes") ) == 0)     use_this_icon = "gtk-yes";
-+    else if (g_strcmp0( label, _("_No") ) == 0)      use_this_icon = "gtk-no";
-+    else if (g_strcmp0( label, _("_Print") ) == 0)   use_this_icon = "gtk-print";
-+    else if (g_strcmp0( label, _("Pre_view") ) == 0) use_this_icon = "gtk-print-preview";
-+    else if (g_strcmp0( label, _("_Open") ) == 0)    use_this_icon = "gtk-open";
-+    else if (g_strcmp0( label, _("_Save") ) == 0)    use_this_icon = "gtk-save";
-+    else if (g_strcmp0( label, _("_Apply") ) == 0)   use_this_icon = "gtk-apply";
-+    else if (g_strcmp0( label, _("_Stop") ) == 0)    use_this_icon = "gtk-stop";
-+    else if (g_strcmp0( label, _("_Delete") ) == 0)  use_this_icon = "gtk-delete";
-+    else if (g_strcmp0( label, _("_Remove") ) == 0)  use_this_icon = "gtk-remove";
-+    else if (g_strcmp0( label, _("_Add") ) == 0)     use_this_icon = "gtk-add";
-+    else if (g_strcmp0( label, _("_Help") ) == 0)    use_this_icon = "gtk-help";
-+    if (use_this_icon)
-+      g_object_set(button, "image", gtk_image_new_from_icon_name(use_this_icon, GTK_ICON_SIZE_BUTTON), NULL);
-+  }
-
++  if (priv->image == NULL)
++    {
++      gchar *use_this_icon = NULL;
++      if (g_strcmp0 (label, _("_Select")) == 0 || g_strcmp0 (label, _("_OK")) == 0)  use_this_icon = "gtk-ok";
++      else if (g_strcmp0 (label, _("_Cancel")) == 0)  use_this_icon = "gtk-cancel";
++      else if (g_strcmp0 (label, _("_Close")) == 0)   use_this_icon = "gtk-close";
++      else if (g_strcmp0 (label, _("_Yes")) == 0)     use_this_icon = "gtk-yes";
++      else if (g_strcmp0 (label, _("_No")) == 0)      use_this_icon = "gtk-no";
++      else if (g_strcmp0 (label, _("_Print")) == 0)   use_this_icon = "gtk-print";
++      else if (g_strcmp0 (label, _("Pre_view")) == 0) use_this_icon = "gtk-print-preview";
++      else if (g_strcmp0 (label, _("_Open")) == 0)    use_this_icon = "gtk-open";
++      else if (g_strcmp0 (label, _("_Save")) == 0)    use_this_icon = "gtk-save";
++      else if (g_strcmp0 (label, _("_Apply")) == 0)   use_this_icon = "gtk-apply";
++      else if (g_strcmp0 (label, _("_Stop")) == 0)    use_this_icon = "gtk-stop";
++      else if (g_strcmp0 (label, _("_Delete")) == 0)  use_this_icon = "gtk-delete";
++      else if (g_strcmp0 (label, _("_Remove")) == 0)  use_this_icon = "gtk-remove";
++      else if (g_strcmp0 (label, _("_Add")) == 0)     use_this_icon = "gtk-add";
++      else if (g_strcmp0 (label, _("_Help")) == 0)    use_this_icon = "gtk-help";
++      if (use_this_icon)
++        g_object_set (button, "image", gtk_image_new_from_icon_name (use_this_icon, GTK_ICON_SIZE_BUTTON), NULL);
++    }
+ 
    new_label = g_strdup (label);
    g_free (priv->label_text);
    priv->label_text = new_label;
-
-diff '--color=auto' -U 5 -r -Z -B ./org/gtk/gtkmenuitem.c ./mod/gtk/gtkmenuitem.c
---- ./org/gtk/gtkmenuitem.c	2017-08-11 21:47:18.000000000 +0200
-+++ ./mod/gtk/gtkmenuitem.c	2017-09-19 20:17:55.937010353 +0200
-@@ -1006,10 +1006,21 @@
+ 
+diff --color -U 5 -r -Z -B ./org/gtk/gtkmenuitem.c ./mod/gtk/gtkmenuitem.c
+--- ./org/gtk/gtkmenuitem.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkmenuitem.c	2017-10-30 20:30:02.683502598 +0100
+@@ -1006,10 +1006,24 @@
   * Returns: a new #GtkMenuItem
   */
  GtkWidget*
  gtk_menu_item_new_with_mnemonic (const gchar *label)
  {
 +  gchar *use_this_icon = NULL;
-+  if (g_strcmp0( label, _("Copy _Link Address") ) == 0 || g_strcmp0( label, _("_Copy") ) == 0
-+    || g_strcmp0( label, _("Copy URL") ) == 0)    use_this_icon = "gtk-copy";
-+  else if (g_strcmp0( label, _("Cu_t") ) == 0)        use_this_icon = "gtk-cut";
-+  else if (g_strcmp0( label, _("_Paste") ) == 0)      use_this_icon = "gtk-paste";
-+  else if (g_strcmp0( label, _("_Delete") ) == 0)     use_this_icon = "gtk-delete";
-+  else if (g_strcmp0( label, _("Select _All") ) == 0) use_this_icon = "gtk-select-all";
-+  else if (g_strcmp0( label, _("_Open Link") ) == 0)  use_this_icon = "gtk-jump-to";
++  if (g_strcmp0 (label, _("Copy _Link Address")) == 0 || g_strcmp0 (label, _("_Copy")) == 0
++    || g_strcmp0 (label, _("Copy URL")) == 0)        use_this_icon = "gtk-copy";
++  else if (g_strcmp0 (label, _("Cu_t")) == 0)        use_this_icon = "gtk-cut";
++  else if (g_strcmp0 (label, _("_Paste")) == 0)      use_this_icon = "gtk-paste";
++  else if (g_strcmp0 (label, _("_Delete")) == 0)     use_this_icon = "gtk-delete";
++  else if (g_strcmp0 (label, _("Select _All")) == 0) use_this_icon = "gtk-select-all";
++  else if (g_strcmp0 (label, _("_Open Link")) == 0)  use_this_icon = "gtk-jump-to";
 +  if (use_this_icon)
-+    return g_object_new(GTK_TYPE_IMAGE_MENU_ITEM, "use-underline", TRUE, "label", label,
-+      "image", gtk_image_new_from_icon_name(use_this_icon,GTK_ICON_SIZE_MENU), NULL);
++    return g_object_new (GTK_TYPE_IMAGE_MENU_ITEM,
++                         "use-underline", TRUE,
++                         "label", label,
++                         "image", gtk_image_new_from_icon_name (use_this_icon, GTK_ICON_SIZE_MENU),
++                         NULL);
    return g_object_new (GTK_TYPE_MENU_ITEM,
                         "use-underline", TRUE,
                         "label", label,
diff --git a/appearance__file-chooser.patch b/appearance__file-chooser.patch
index 9d4eaa3a98a3..2e4607362711 100644
--- a/appearance__file-chooser.patch
+++ b/appearance__file-chooser.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-27 00:45:37.555159578 +0200
-@@ -77,10 +77,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-10-30 20:35:48.363519726 +0100
+@@ -76,10 +76,11 @@
  #include "gtkspinner.h"
  #include "gtkseparator.h"
  #include "gtkmodelbutton.h"
@@ -13,21 +13,22 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
  
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-@@ -8596,10 +8597,19 @@
+@@ -8595,10 +8596,20 @@
    gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button);
    gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button);
    gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view);
  
    add_actions (impl);
 +  static gboolean style_added = FALSE;
-+  if (!style_added) {
-+    style_added = TRUE;
-+    GtkCssProvider *provider = gtk_css_provider_new();
-+    gtk_css_provider_load_from_data(provider,
-+      "filechooser .sidebar-icon, filechooser .path-bar, filechooser .path-bar + button { opacity: 1; -gtk-icon-style: regular; }\0", -1, NULL);
-+    gtk_style_context_add_provider_for_screen (gtk_widget_get_screen(GTK_WIDGET(impl)),
-+      GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-+  }
++  if (!style_added)
++    {
++      style_added = TRUE;
++      GtkCssProvider *provider = gtk_css_provider_new ();
++      gtk_css_provider_load_from_data (provider,
++        "filechooser .sidebar-icon, filechooser .path-bar, filechooser .path-bar + button { opacity: 1; -gtk-icon-style: regular; }", -1, NULL);
++      gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)),
++        GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++    }
  }
  
  void
diff --git a/appearance__print-dialog.patch b/appearance__print-dialog.patch
index ef98c9592415..06daefe72075 100644
--- a/appearance__print-dialog.patch
+++ b/appearance__print-dialog.patch
@@ -1,25 +1,25 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkprintunixdialog.c ./mod/gtk/gtkprintunixdialog.c
---- ./org/gtk/gtkprintunixdialog.c	2017-08-22 14:33:11.000000000 +0200
-+++ ./mod/gtk/gtkprintunixdialog.c	2017-08-26 02:10:56.967546663 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkprintunixdialog.c ./mod/gtk/gtkprintunixdialog.c
+--- ./org/gtk/gtkprintunixdialog.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkprintunixdialog.c	2017-10-30 20:39:40.803531243 +0100
 @@ -747,10 +747,15 @@
                            _("_Print"), GTK_RESPONSE_OK,
                            NULL);
    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
    widget = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
    gtk_widget_set_sensitive (widget, FALSE);
-+  GtkCssProvider *provider = gtk_css_provider_new();
-+  gtk_css_provider_load_from_data(provider, ".dialog-action-box { margin: 0; }\0", -1, NULL);
-+  GtkStyleContext *context = gtk_widget_get_style_context(gtk_widget_get_parent(gtk_dialog_get_action_area(GTK_DIALOG(dialog))));
-+  gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER(provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
++  GtkCssProvider *provider = gtk_css_provider_new ();
++  gtk_css_provider_load_from_data (provider, ".dialog-action-box { margin: 0; }", -1, NULL);
++  GtkStyleContext *context = gtk_widget_get_style_context (gtk_widget_get_parent (gtk_dialog_get_action_area (GTK_DIALOG (dialog))));
++  gtk_style_context_add_provider (context, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 +  gtk_style_context_save (context);
-
+ 
    /* Treeview auxiliary functions need to be setup here */
    gtk_tree_model_filter_set_visible_func (priv->printer_list_filter,
                                            (GtkTreeModelFilterVisibleFunc) is_printer_active,
                                            dialog,
-diff -U 5 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixdialog.ui
---- ./org/gtk/ui/gtkprintunixdialog.ui	2017-08-22 14:33:11.000000000 +0200
-+++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-08-26 02:09:14.667541594 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/ui/gtkprintunixdialog.ui ./mod/gtk/ui/gtkprintunixdialog.ui
+--- ./org/gtk/ui/gtkprintunixdialog.ui	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/ui/gtkprintunixdialog.ui	2017-10-30 20:37:01.923523370 +0100
 @@ -46,31 +46,32 @@
      <property name="upper">1000</property>
      <property name="value">100</property>
diff --git a/appearance__smaller-statusbar.patch b/appearance__smaller-statusbar.patch
index c7721e445711..f96b45257675 100644
--- a/appearance__smaller-statusbar.patch
+++ b/appearance__smaller-statusbar.patch
@@ -1,6 +1,6 @@
-diff -U 5 -r -Z -B ./org/gtk/ui/gtkstatusbar.ui ./mod/gtk/ui/gtkstatusbar.ui
---- ./org/gtk/ui/gtkstatusbar.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtkstatusbar.ui	2017-07-30 13:30:05.083475912 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/ui/gtkstatusbar.ui ./mod/gtk/ui/gtkstatusbar.ui
+--- ./org/gtk/ui/gtkstatusbar.ui	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/ui/gtkstatusbar.ui	2017-10-30 20:40:46.896867851 +0100
 @@ -3,12 +3,12 @@
    <!-- interface-requires gtk+ 3.10 -->
    <template class="GtkStatusbar" parent="GtkBox">
diff --git a/create-patch.sh b/create-patch.sh
index 548e20d10c0e..0cd938087939 100755
--- a/create-patch.sh
+++ b/create-patch.sh
@@ -8,6 +8,6 @@
 # Patch file is saved under name specified by first argument.
 
 if [[ -d ./org/gtk ]] && [[ -d ./mod/gtk ]] && [[ $1 ]]; then
-	command="diff --color=auto -U 5 -r -Z -B ./org/gtk ./mod/gtk"
+	command="diff --color -U 5 -r -Z -B ./org/gtk ./mod/gtk"
 	$command > "$1.patch"; reset; $command
-fi
\ No newline at end of file
+fi
diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch
index d6890467e997..008312eccac4 100644
--- a/csd__clean-headerbar.patch
+++ b/csd__clean-headerbar.patch
@@ -1,14 +1,14 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
---- ./org/gtk/gtkheaderbar.c	2017-08-08 01:36:19.000000000 +0200
-+++ ./mod/gtk/gtkheaderbar.c	2017-08-08 21:07:59.106864096 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
+--- ./org/gtk/gtkheaderbar.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkheaderbar.c	2017-10-30 22:47:52.557245688 +0100
 @@ -321,10 +321,12 @@
  
    is_sovereign_window = (!gtk_window_get_modal (window) &&
                            gtk_window_get_transient_for (window) == NULL &&
                            gtk_window_get_type_hint (window) == GDK_WINDOW_TYPE_HINT_NORMAL);
  
-+  if (g_getenv("GTK_CSD") == FALSE)
-+    layout_desc = g_strdup("menu");
++  if (g_getenv ("GTK_CSD") == FALSE)
++    layout_desc = g_strdup ("menu");
    tokens = g_strsplit (layout_desc, ":", 2);
    if (tokens)
      {
@@ -21,7 +21,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
  
                    priv->titlebar_icon = image;
 -                  if (!_gtk_header_bar_update_window_icon (bar, window))
-+                  if (g_getenv("GTK_CSD") == FALSE || !_gtk_header_bar_update_window_icon (bar, window))
++                  if (g_getenv ("GTK_CSD") == FALSE || !_gtk_header_bar_update_window_icon (bar, window))
                      gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon),
 -                                                  "application-x-executable-symbolic", GTK_ICON_SIZE_MENU);
 +                                                  "pan-down-symbolic", GTK_ICON_SIZE_MENU);
@@ -30,16 +30,16 @@ diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
                         is_sovereign_window)
                  {
                    button = gtk_button_new ();
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-08-08 01:36:19.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-08-08 20:48:04.803471587 +0200
-@@ -9092,10 +9092,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 22:46:41.683908843 +0100
+@@ -9267,10 +9267,11 @@
  
  static void
  gtk_window_do_popup (GtkWindow      *window,
                       GdkEventButton *event)
  {
-+  if (g_getenv("GTK_CSD") == FALSE) return;
++  if (g_getenv ("GTK_CSD") == FALSE) return;
    if (!gdk_window_show_window_menu (_gtk_widget_get_window (GTK_WIDGET (window)),
                                      (GdkEvent *) event))
      gtk_window_do_popup_fallback (window, event);
diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch
index 6841e927004b..e04178216748 100644
--- a/csd__disabled-by-default.patch
+++ b/csd__disabled-by-default.patch
@@ -1,14 +1,14 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-30 00:21:00.271272407 +0200
-@@ -4136,11 +4136,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 21:04:21.086937922 +0100
+@@ -4147,11 +4147,11 @@
    else
      {
        gtk_style_context_add_class (gtk_widget_get_style_context (widget), "solid-csd");
      }
  
 -  priv->client_decorated = TRUE;
-+  priv->client_decorated = (g_getenv("GTK_CSD") != FALSE);
++  priv->client_decorated = (g_getenv ("GTK_CSD") != FALSE);
  }
  
  static void
diff --git a/csd__headerbar-title.patch b/csd__headerbar-title.patch
index daa2767d8b31..05d8802937d4 100644
--- a/csd__headerbar-title.patch
+++ b/csd__headerbar-title.patch
@@ -1,19 +1,19 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
---- ./org/gtk/gtkheaderbar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkheaderbar.c	2017-07-30 02:19:16.171623995 +0200
-@@ -565,10 +565,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
+--- ./org/gtk/gtkheaderbar.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkheaderbar.c	2017-10-30 21:12:42.800296113 +0100
+@@ -572,10 +572,11 @@
  }
  
  static void
  construct_label_box (GtkHeaderBar *bar)
  {
-+  if (g_getenv("GTK_CSD") == FALSE) return;
++  if (g_getenv ("GTK_CSD") == FALSE) return;
    GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar);
  
    g_assert (priv->label_box == NULL);
  
    priv->label_box = create_title_box (priv->title,
-@@ -1348,10 +1349,11 @@
+@@ -1355,10 +1356,11 @@
      }
  
    gtk_widget_set_visible (priv->subtitle_sizing_label, priv->has_subtitle || (priv->subtitle && priv->subtitle[0]));
@@ -25,17 +25,17 @@ diff -U 5 -r -Z -B ./org/gtk/gtkheaderbar.c ./mod/gtk/gtkheaderbar.c
  /**
   * gtk_header_bar_get_subtitle:
   * @bar: a #GtkHeaderBar
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-30 02:19:59.491626142 +0200
-@@ -4147,10 +4147,12 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 21:13:30.050298455 +0100
+@@ -4158,10 +4158,12 @@
                            GtkWindow    *self)
  {
    const gchar *title;
  
    title = gtk_header_bar_get_title (titlebar);
-+  if (gtk_header_bar_get_subtitle(titlebar))
-+    title = g_strconcat(title, " — ", gtk_header_bar_get_subtitle(titlebar), NULL);
++  if (gtk_header_bar_get_subtitle (titlebar))
++    title = g_strconcat (title, " — ", gtk_header_bar_get_subtitle (titlebar), NULL);
    gtk_window_set_title_internal (self, title, FALSE);
  }
  
diff --git a/csd__server-side-shadow.patch b/csd__server-side-shadow.patch
index 651b1f28dcc0..13a385db69f6 100644
--- a/csd__server-side-shadow.patch
+++ b/csd__server-side-shadow.patch
@@ -1,13 +1,13 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-30 00:23:13.484612341 +0200
-@@ -4076,10 +4076,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 21:15:37.183638087 +0100
+@@ -4087,10 +4087,11 @@
  }
  
  static gboolean
  gtk_window_supports_client_shadow (GtkWindow *window)
  {
-+  if (g_strcmp0(g_getenv("GTK_CSD"), "1") != 0) return FALSE;
++  if (g_strcmp0 (g_getenv("GTK_CSD"), "1") != 0) return FALSE;
    GdkDisplay *display;
    GdkScreen *screen;
    GdkVisual *visual;
diff --git a/default-settings.patch b/default-settings.patch
index 7c6e3770d5d0..8558ee6bafd3 100644
--- a/default-settings.patch
+++ b/default-settings.patch
@@ -1,6 +1,6 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkscrolledwindow.c ./mod/gtk/gtkscrolledwindow.c
---- ./org/gtk/gtkscrolledwindow.c	2017-09-02 00:17:12.000000000 +0200
-+++ ./mod/gtk/gtkscrolledwindow.c	2017-09-19 18:52:20.393422563 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkscrolledwindow.c ./mod/gtk/gtkscrolledwindow.c
+--- ./org/gtk/gtkscrolledwindow.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkscrolledwindow.c	2017-10-30 21:18:17.203646016 +0100
 @@ -4408,11 +4408,11 @@
    GtkScrolledWindowPrivate *priv = scrolled_window->priv;
    gboolean use_indicators;
@@ -14,9 +14,9 @@ diff -U 5 -r -Z -B ./org/gtk/gtkscrolledwindow.c ./mod/gtk/gtkscrolledwindow.c
    if (priv->use_indicators != use_indicators)
      {
        priv->use_indicators = use_indicators;
-diff -U 5 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
---- ./org/gtk/gtksettings.c	2017-08-11 21:47:18.000000000 +0200
-+++ ./mod/gtk/gtksettings.c	2017-09-19 18:52:39.926756865 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
+--- ./org/gtk/gtksettings.c	2017-10-26 06:32:02.000000000 +0200
++++ ./mod/gtk/gtksettings.c	2017-10-30 21:18:17.206979350 +0100
 @@ -59,11 +59,11 @@
  #include "deprecated/gtkrc.h"
  
@@ -30,9 +30,9 @@ diff -U 5 -r -Z -B ./org/gtk/gtksettings.c ./mod/gtk/gtksettings.c
  /**
   * SECTION:gtksettings
   * @Short_description: Sharing settings between applications
-diff -U 5 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
+diff --color -U 5 -r -Z -B ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml
 --- ./org/gtk/org.gtk.Settings.FileChooser.gschema.xml	2016-10-22 06:17:51.000000000 +0200
-+++ ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-09-19 18:51:32.836753540 +0200
++++ ./mod/gtk/org.gtk.Settings.FileChooser.gschema.xml	2017-10-30 21:18:17.206979350 +0100
 @@ -117,11 +117,11 @@
        <description>
  	The size (width, height) of the GtkFileChooserDialog's window, in pixels.
diff --git a/do-mushrooms.sh b/do-mushrooms.sh
deleted file mode 100755
index a732d64f1b64..000000000000
--- a/do-mushrooms.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# This script is used to apply Mushroom's patches to GTK source code.
-
-# Current working directory should be set to main directory of GTK source code.
-# Script should be placed beside patches files.
-
-patch_makefiles()
-{
-	_replace_string_in_file()
-	{
-		sed -i".bak" "s/$1/$2/" "$3"
-		rm "$3.bak"
-	}
-
-	_replace_string_in_file \
-		"SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples" \
-		"SRC_SUBDIRS = gdk gtk libgail-util modules demos" \
-		"Makefile.am"
-
-	_replace_string_in_file \
-		"SUBDIRS = po po-properties \$(SRC_SUBDIRS) docs m4macros build" \
-		"SUBDIRS = po \$(SRC_SUBDIRS) m4macros build" \
-		"Makefile.am"
-
-	_replace_string_in_file \
-		"SUBDIRS = gtk-demo widget-factory icon-browser" \
-		"SUBDIRS = widget-factory" \
-		"demos/Makefile.am"
-
-	_replace_string_in_file "SUBDIRS += cloudprint" "" "modules/printbackends/Makefile.am"
-	_replace_string_in_file "SUBDIRS += cups" 	    "" "modules/printbackends/Makefile.am"
-	_replace_string_in_file "gtk-update-icon-cache" "" "gtk/Makefile.am"
-}
-
-patch_gtk_code()
-{
-	patches_dir=$(dirname `realpath "$0"`)
-
-	for patch_file in $patches_dir/*.patch; do
-		patch -d "gtk" -p 3 -i "$patch_file"
-	done
-
-	cat "$patches_dir/smaller-adwaita.css" | tee -a gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null
-}
-
-# Make building faster by skipping tests, code examples and unused elements.
-patch_makefiles
-
-# Apply patches to GTK code.
-patch_gtk_code
\ No newline at end of file
diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch
index 63a1a759f9ca..22f3e5b2088e 100644
--- a/file-chooser__places-sidebar.patch
+++ b/file-chooser__places-sidebar.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 13:16:32.666768991 +0200
-@@ -594,10 +594,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- ./org/gtk/gtkplacessidebar.c	2017-10-02 18:00:58.000000000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2017-10-30 21:21:17.593654954 +0100
+@@ -616,10 +616,11 @@
  }
  
  static void
@@ -13,7 +13,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
  
    dirs = NULL;
    for (index = 0; index < G_USER_N_DIRECTORIES; index++)
-@@ -1247,12 +1248,10 @@
+@@ -1383,12 +1384,10 @@
        BookmarkQueryClosure *clos;
  
        root = sl->data;
@@ -26,7 +26,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
          continue;
  
        clos = g_slice_new (BookmarkQueryClosure);
-@@ -3872,11 +3871,11 @@
+@@ -4066,11 +4065,11 @@
    sidebar->dragging_over = FALSE;
    sidebar->drag_data_info = DND_UNKNOWN;
  
@@ -39,9 +39,9 @@ diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
                              G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
                              NULL,
                              "org.freedesktop.hostname1",
-diff -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
---- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-07-30 13:17:04.406770563 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/ui/gtkfilechooserwidget.ui ./mod/gtk/ui/gtkfilechooserwidget.ui
+--- ./org/gtk/ui/gtkfilechooserwidget.ui	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/ui/gtkfilechooserwidget.ui	2017-10-30 21:21:17.593654954 +0100
 @@ -14,11 +14,12 @@
              <child>
                <object class="GtkPlacesSidebar" id="places_sidebar">
diff --git a/file-chooser__single-click.patch b/file-chooser__single-click.patch
index 2414bf8f2ba1..ce2467f2d1f4 100644
--- a/file-chooser__single-click.patch
+++ b/file-chooser__single-click.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-07-30 13:18:16.970107493 +0200
-@@ -2420,11 +2420,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-10-30 21:22:16.100324520 +0100
+@@ -2419,11 +2419,11 @@
    device = gdk_event_get_source_device ((GdkEvent *) event);
    is_touchscreen = gtk_simulate_touchscreen () ||
                     gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN;
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch
index eebf7a00660b..543ad7bba834 100644
--- a/file-chooser__typeahead.patch
+++ b/file-chooser__typeahead.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-25 00:23:59.644034148 +0200
-@@ -1399,11 +1399,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-10-30 21:23:33.040328332 +0100
+@@ -1398,11 +1398,11 @@
          {
            location_popup_handler (impl, event->string);
            return TRUE;
@@ -14,7 +14,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
          operation_mode_set (impl, OPERATION_MODE_SEARCH);
        return TRUE;
      }
-@@ -2476,11 +2476,11 @@
+@@ -2475,11 +2475,11 @@
  static void
  file_list_set_sort_column_ids (GtkFileChooserWidget *impl)
  {
@@ -27,7 +27,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
    gtk_tree_view_column_set_sort_column_id (priv->list_size_column, MODEL_COL_SIZE);
    gtk_tree_view_column_set_sort_column_id (priv->list_location_column, MODEL_COL_LOCATION_TEXT);
-@@ -7152,12 +7152,10 @@
+@@ -7151,12 +7151,10 @@
  {
    GList *l, *files, *files_with_info, *infos;
    GFile *file;
@@ -40,7 +40,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
    files_with_info = NULL;
    infos = NULL;
    for (l = hits; l; l = l->next)
-@@ -7496,11 +7494,11 @@
+@@ -7495,11 +7493,11 @@
    GtkFileChooserWidget *impl = load_data->impl;
    GtkFileChooserWidgetPrivate *priv = impl->priv;
  
@@ -53,7 +53,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
    gtk_tree_view_column_set_sort_column_id (priv->list_size_column, -1);
    gtk_tree_view_column_set_sort_column_id (priv->list_location_column, -1);
-@@ -8422,14 +8420,10 @@
+@@ -8421,14 +8419,10 @@
    gtk_binding_entry_add_signal (binding_set,
                                  GDK_KEY_s, GDK_MOD1_MASK,
                                  "search-shortcut",
@@ -68,7 +68,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
                                  0);
    gtk_binding_entry_add_signal (binding_set,
                                  GDK_KEY_p, GDK_MOD1_MASK,
-@@ -8543,10 +8537,11 @@
+@@ -8542,10 +8536,11 @@
    /* Some qdata, qdata can't be set with GtkBuilder */
    g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), "fmq-name", "file_list");
    g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl);
diff --git a/fix-3.22.25-mistake.patch b/fix-3.22.25-mistake.patch
new file mode 100644
index 000000000000..e66bf36837cd
--- /dev/null
+++ b/fix-3.22.25-mistake.patch
@@ -0,0 +1,29 @@
+From 738c18defdacf4d81d8b3376173c2b0e0a29896a Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@debian.org>
+Date: Sun, 29 Oct 2017 17:50:13 +0000
+Subject: [PATCH] wayland: Distribute protocol/server-decoration.xml in
+ tarballs
+
+Otherwise, builds that include the Wayland backend fail.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ gdk/wayland/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
+index 9295b1a15b..cccb572f15 100644
+--- a/gdk/wayland/Makefile.am
++++ b/gdk/wayland/Makefile.am
+@@ -104,6 +104,7 @@ endef
+ 
+ EXTRA_DIST += 					\
+ 	protocol/gtk-primary-selection.xml	\
+-	protocol/gtk-shell.xml
++	protocol/gtk-shell.xml			\
++	protocol/server-decoration.xml
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+2.15.0.rc2
+
diff --git a/other__atk-bridge-errors.patch b/other__atk-bridge-errors.patch
index 23ea58b757c0..23e84b8d74ea 100644
--- a/other__atk-bridge-errors.patch
+++ b/other__atk-bridge-errors.patch
@@ -1,16 +1,16 @@
-diff -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
---- ./org/gtk/a11y/gtkaccessibility.c	2017-08-11 21:47:18.000000000 +0200
-+++ ./mod/gtk/a11y/gtkaccessibility.c	2017-09-17 19:10:42.210314169 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/a11y/gtkaccessibility.c ./mod/gtk/a11y/gtkaccessibility.c
+--- ./org/gtk/a11y/gtkaccessibility.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/a11y/gtkaccessibility.c	2017-10-30 21:26:10.880336153 +0100
 @@ -987,10 +987,13 @@
  
    _gtk_accessibility_override_atk_util ();
    do_window_event_initialization ();
  
  #ifdef GDK_WINDOWING_X11
-+  GLogWriterOutput h_null_writer () { return G_LOG_WRITER_HANDLED; }
-+  g_log_set_writer_func(h_null_writer, NULL, NULL);
++  GLogWriterOutput mushrooms_null_writer () { return G_LOG_WRITER_HANDLED; }
++  g_log_set_writer_func (mushrooms_null_writer, NULL, NULL);
    atk_bridge_adaptor_init (NULL, NULL);
-+  g_log_set_writer_func(g_log_writer_default, NULL, NULL);
++  g_log_set_writer_func (g_log_writer_default, NULL, NULL);
  #endif
  
    atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
diff --git a/other__mnemonics-delay.patch b/other__mnemonics-delay.patch
index ba660025ee39..15d9768559f5 100644
--- a/other__mnemonics-delay.patch
+++ b/other__mnemonics-delay.patch
@@ -1,6 +1,6 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-07-30 13:27:20.190134408 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 21:26:46.180337901 +0100
 @@ -149,11 +149,11 @@
   *
   * GtkWindow adds the .titlebar and .default-decoration style classes to the
diff --git a/other__window-background.patch b/other__window-background.patch
index 468aacb57b43..c7f70be07982 100644
--- a/other__window-background.patch
+++ b/other__window-background.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
---- ./org/gtk/gtkwindow.c	2017-09-02 00:17:12.000000000 +0200
-+++ ./mod/gtk/gtkwindow.c	2017-09-13 02:21:55.594091126 +0200
-@@ -7306,10 +7306,12 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkwindow.c ./mod/gtk/gtkwindow.c
+--- ./org/gtk/gtkwindow.c	2017-10-27 22:06:52.000000000 +0200
++++ ./mod/gtk/gtkwindow.c	2017-10-30 21:27:43.370340735 +0100
+@@ -7428,10 +7428,12 @@
      }
  
    gtk_widget_set_window (widget, gdk_window);
diff --git a/popovers__color-chooser.patch b/popovers__color-chooser.patch
index 65c2089a90d3..a216122f4c63 100644
--- a/popovers__color-chooser.patch
+++ b/popovers__color-chooser.patch
@@ -1,24 +1,25 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
---- ./org/gtk/gtkcolorswatch.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkcolorswatch.c	2017-07-30 13:40:06.546839046 +0200
-@@ -345,10 +345,20 @@
- }
- 
+diff --color -U 5 -r -Z -B ./org/gtk/gtkcolorswatch.c ./mod/gtk/gtkcolorswatch.c
+--- ./org/gtk/gtkcolorswatch.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkcolorswatch.c	2017-10-30 21:46:59.750398031 +0100
+@@ -347,10 +347,21 @@
  static void
  do_popup (GtkColorSwatch *swatch)
  {
-+  if (swatch->priv->popover == NULL) {
+   if (swatch->priv->popover == NULL)
+     {
 +      GtkWidget *item;
-+      swatch->priv->popover = gtk_menu_new();
-+      item = gtk_menu_item_new_with_mnemonic(_("C_ustomize"));
++      swatch->priv->popover = gtk_menu_new ();
++      item = gtk_menu_item_new_with_mnemonic (_ ("C_ustomize"));
 +      g_signal_connect_swapped (item, "activate", G_CALLBACK (emit_customize), swatch);
-+      gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
-+      gtk_menu_shell_append(GTK_MENU_SHELL(swatch->priv->popover), item);
-+  }
-+  gtk_menu_popup_at_pointer(GTK_MENU(swatch->priv->popover), NULL);
++      gtk_widget_set_visible (GTK_WIDGET (item), TRUE);
++      gtk_menu_shell_append (GTK_MENU_SHELL (swatch->priv->popover), item);
++    }
++  gtk_menu_popup_at_pointer (GTK_MENU (swatch->priv->popover), NULL);
 +  return;
-   if (swatch->priv->popover == NULL)
-     {
++  if (swatch->priv->popover == NULL)
++    {
        GtkWidget *box;
        GtkWidget *item;
  
+       swatch->priv->popover = gtk_popover_new (GTK_WIDGET (swatch));
+       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch
index b86a99df1719..538b3f4a1770 100644
--- a/popovers__file-chooser-list.patch
+++ b/popovers__file-chooser-list.patch
@@ -1,6 +1,6 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
---- ./org/gtk/gtkfilechooserwidget.c	2017-08-22 14:33:11.000000000 +0200
-+++ ./mod/gtk/gtkfilechooserwidget.c	2017-08-27 00:53:14.541848888 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidget.c
+--- ./org/gtk/gtkfilechooserwidget.c	2017-10-02 18:00:49.000000000 +0200
++++ ./mod/gtk/gtkfilechooserwidget.c	2017-10-30 21:51:33.783744942 +0100
 @@ -26,10 +26,11 @@
  #include "gtkbutton.h"
  #include "gtkcelllayout.h"
@@ -13,78 +13,78 @@ diff -U 5 -r -Z -B ./org/gtk/gtkfilechooserwidget.c ./mod/gtk/gtkfilechooserwidg
  #include "gtkdragsource.h"
  #include "gtkdragdest.h"
  #include "gtkentry.h"
-@@ -2222,10 +2223,14 @@
+@@ -2221,10 +2222,14 @@
  static GtkWidget *
  append_separator (GtkWidget *box)
  {
    GtkWidget *separator;
  
-+  separator = gtk_separator_menu_item_new();
-+  gtk_widget_set_visible(GTK_WIDGET(separator), TRUE);
-+  gtk_menu_shell_append(GTK_MENU_SHELL(box), separator);
++  separator = gtk_separator_menu_item_new ();
++  gtk_widget_set_visible (GTK_WIDGET (separator), TRUE);
++  gtk_menu_shell_append (GTK_MENU_SHELL (box), separator);
 +  return separator;
    separator = g_object_new (GTK_TYPE_SEPARATOR,
                              "orientation", GTK_ORIENTATION_HORIZONTAL,
                              "visible", TRUE,
                              "margin-start", 12,
                              "margin-end", 12,
-@@ -2243,10 +2248,18 @@
+@@ -2242,10 +2247,18 @@
              const gchar *label,
              const gchar *action)
  {
    GtkWidget *item;
  
-+  if (g_str_match_string("toggle", action, TRUE))
-+    item = gtk_check_menu_item_new_with_mnemonic(label);
++  if (g_str_match_string ("toggle", action, TRUE))
++    item = gtk_check_menu_item_new_with_mnemonic (label);
 +  else
-+    item = gtk_image_menu_item_new_with_mnemonic(label);
-+  g_object_set(G_OBJECT(item), "action-name", action, NULL);
-+  gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
-+  gtk_menu_shell_append(GTK_MENU_SHELL(box), item);
++    item = gtk_image_menu_item_new_with_mnemonic (label);
++  g_object_set (G_OBJECT (item), "action-name", action, NULL);
++  gtk_widget_set_visible (GTK_WIDGET (item), TRUE);
++  gtk_menu_shell_append (GTK_MENU_SHELL (box), item);
 +  return item;
   item = g_object_new (GTK_TYPE_MODEL_BUTTON,
                         "visible", TRUE,
                         "action-name", action,
                         "text", label,
                         NULL);
-@@ -2267,10 +2280,13 @@
+@@ -2266,10 +2279,13 @@
    priv->browse_files_popover = gtk_popover_new (priv->browse_files_tree_view);
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 10, NULL);
    gtk_widget_show (box);
    gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box);
-+  priv->browse_files_popover = gtk_menu_new();
-+  gtk_menu_attach_to_widget(GTK_MENU(priv->browse_files_popover), GTK_WIDGET(priv->browse_files_tree_view), NULL);
++  priv->browse_files_popover = gtk_menu_new ();
++  gtk_menu_attach_to_widget (GTK_MENU (priv->browse_files_popover), GTK_WIDGET (priv->browse_files_tree_view), NULL);
 +  box = priv->browse_files_popover;
  
    priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
    priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open");
    priv->copy_file_location_item = add_button (box, _("_Copy Location"), "item.copy-location");
    priv->add_shortcut_item = add_button (box, _("_Add to Bookmarks"), "item.add-shortcut");
-@@ -2282,10 +2298,16 @@
+@@ -2281,10 +2297,16 @@
  
    priv->hidden_files_item = add_button (box, _("Show _Hidden Files"), "item.toggle-show-hidden");
    priv->size_column_item = add_button (box, _("Show _Size Column"), "item.toggle-show-size");
    priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time");
    priv->sort_directories_item = add_button (box, _("Sort _Folders before Files"), "item.toggle-sort-dirs-first");
-+  g_object_set(priv->visit_file_item, "image", gtk_image_new_from_icon_name("gtk-jump-to",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->open_folder_item, "image", gtk_image_new_from_icon_name("gtk-open",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->copy_file_location_item, "image", gtk_image_new_from_icon_name("gtk-copy",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->delete_file_item, "image", gtk_image_new_from_icon_name("gtk-delete",GTK_ICON_SIZE_MENU), NULL);
-+  g_object_set(priv->trash_file_item, "image", gtk_image_new_from_icon_name("user-trash-full",GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->visit_file_item,         "image", gtk_image_new_from_icon_name ("gtk-jump-to",    GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->open_folder_item,        "image", gtk_image_new_from_icon_name ("gtk-open",       GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->copy_file_location_item, "image", gtk_image_new_from_icon_name ("gtk-copy",       GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->add_shortcut_item,       "image", gtk_image_new_from_icon_name ("gtk-add",        GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->delete_file_item,        "image", gtk_image_new_from_icon_name ("gtk-delete",     GTK_ICON_SIZE_MENU), NULL);
++  g_object_set (priv->trash_file_item,         "image", gtk_image_new_from_icon_name ("user-trash-full",GTK_ICON_SIZE_MENU), NULL);
  }
  
  /* Updates the popover for the file list, creating it if necessary */
  static void
  file_list_update_popover (GtkFileChooserWidget *impl)
-@@ -2338,10 +2360,12 @@
+@@ -2337,10 +2359,12 @@
    GList *list;
    GtkTreePath *path;
  
  
    file_list_update_popover (impl);
-+  gtk_menu_popup_at_pointer(GTK_MENU(priv->browse_files_popover), NULL);
++  gtk_menu_popup_at_pointer (GTK_MENU (priv->browse_files_popover), NULL);
 +  return;
  
    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
diff --git a/popovers__menu-button.patch b/popovers__menu-button.patch
index 0e888278087d..3cc1fb0f477c 100644
--- a/popovers__menu-button.patch
+++ b/popovers__menu-button.patch
@@ -1,6 +1,6 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
---- ./org/gtk/gtkmenubutton.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkmenubutton.c	2017-07-30 13:35:02.580157319 +0200
+diff --color -U 5 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
+--- ./org/gtk/gtkmenubutton.c	2017-10-26 06:32:02.000000000 +0200
++++ ./mod/gtk/gtkmenubutton.c	2017-10-30 22:00:30.863771554 +0100
 @@ -821,11 +821,11 @@
    if (menu_model)
      g_object_ref (menu_model);
@@ -8,7 +8,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkmenubutton.c ./mod/gtk/gtkmenubutton.c
    if (menu_model)
      {
 -      if (priv->use_popover)
-+      if (g_strcmp0(g_getenv("GTK_CSD"), "1") == 0 && priv->use_popover)
++      if (g_getenv ("GTK_CSD") != FALSE && priv->use_popover)
          {
            GtkWidget *popover;
  
diff --git a/popovers__places-sidebar.patch b/popovers__places-sidebar.patch
index 7a956e1f46fa..e35074701572 100644
--- a/popovers__places-sidebar.patch
+++ b/popovers__places-sidebar.patch
@@ -1,7 +1,7 @@
-diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
---- ./org/gtk/gtkplacessidebar.c	2017-07-19 04:55:39.000000000 +0200
-+++ ./mod/gtk/gtkplacessidebar.c	2017-07-30 18:32:50.010014344 +0200
-@@ -57,10 +57,11 @@
+diff --color -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
+--- ./org/gtk/gtkplacessidebar.c	2017-10-02 18:00:58.000000000 +0200
++++ ./mod/gtk/gtkplacessidebar.c	2017-10-30 22:05:04.543785114 +0100
+@@ -61,10 +61,11 @@
  #include "gtkseparator.h"
  #include "gtkentry.h"
  #include "gtkgesturelongpress.h"
@@ -13,7 +13,7 @@ diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
   * SECTION:gtkplacessidebar
   * @Short_description: Sidebar that displays frequently-used places in the file system
   * @Title: GtkPlacesSidebar
-@@ -2142,36 +2143,36 @@
+@@ -2278,36 +2279,36 @@
    gtk_widget_set_visible (data->rescan_item, show_rescan);
    gtk_widget_set_visible (data->start_item, show_start);
    gtk_widget_set_visible (data->stop_item, show_stop);
@@ -60,116 +60,116 @@ diff -U 5 -r -Z -B ./org/gtk/gtkplacessidebar.c ./mod/gtk/gtkplacessidebar.c
          default:
          case G_DRIVE_START_STOP_TYPE_UNKNOWN:
            /* uses defaults set above */
-@@ -3335,10 +3336,17 @@
+@@ -3471,10 +3472,17 @@
  static GtkWidget *
  append_separator (GtkWidget *box)
  {
    GtkWidget *separator;
  
-+  if (GTK_IS_MENU(box))
-+  {
-+    separator = gtk_separator_menu_item_new();
-+    gtk_widget_set_visible(GTK_WIDGET(separator), TRUE);
-+    gtk_menu_shell_append(GTK_MENU_SHELL(box), separator);
-+    return separator;
-+  }
++  if (GTK_IS_MENU (box))
++    {
++      separator = gtk_separator_menu_item_new();
++      gtk_widget_set_visible(GTK_WIDGET(separator), TRUE);
++      gtk_menu_shell_append(GTK_MENU_SHELL(box), separator);
++      return separator;
++    }
    separator = g_object_new (GTK_TYPE_SEPARATOR,
                              "orientation", GTK_ORIENTATION_HORIZONTAL,
                              "visible", TRUE,
                              "margin-top", 6,
                              "margin-bottom", 6,
-@@ -3353,10 +3361,18 @@
+@@ -3489,10 +3497,18 @@
              const gchar *label,
              const gchar *action)
  {
    GtkWidget *item;
  
-+  if (GTK_IS_MENU(box))
-+  {
-+    item = gtk_image_menu_item_new_with_mnemonic(label);
-+    g_object_set(G_OBJECT(item), "action-name", action, NULL);
-+    gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
-+    gtk_menu_shell_append(GTK_MENU_SHELL(box), item);
-+    return item;
-+  }
++  if (GTK_IS_MENU (box))
++    {
++      item = gtk_image_menu_item_new_with_mnemonic(label);
++      g_object_set(G_OBJECT(item), "action-name", action, NULL);
++      gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
++      gtk_menu_shell_append(GTK_MENU_SHELL(box), item);
++      return item;
++    }
    item = g_object_new (GTK_TYPE_MODEL_BUTTON,
                         "visible", TRUE,
                         "action-name", action,
                         "text", label,
                         NULL);
-@@ -3370,10 +3386,21 @@
+@@ -3506,10 +3522,21 @@
                   const gchar        *label,
                   GtkPlacesOpenFlags  flags)
  {
    GtkWidget *item;
  
-+  if (GTK_IS_MENU(box))
-+  {
-+    item = gtk_image_menu_item_new_with_mnemonic(label);
-+    g_object_set(G_OBJECT(item),
-+       "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other",
-+       "action-target", g_variant_new_int32 (flags),
-+    NULL);
-+    gtk_widget_set_visible(GTK_WIDGET(item), TRUE);
-+    gtk_menu_shell_append(GTK_MENU_SHELL(box), item);
-+    return item;
-+  }
++  if (GTK_IS_MENU (box))
++    {
++      item = gtk_image_menu_item_new_with_mnemonic (label);
++      g_object_set(G_OBJECT (item),
++        "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other",
++        "action-target", g_variant_new_int32 (flags),
++      NULL);
++      gtk_widget_set_visible (GTK_WIDGET (item), TRUE);
++      gtk_menu_shell_append (GTK_MENU_SHELL (box), item);
++      return item;
++    }
    item = g_object_new (GTK_TYPE_MODEL_BUTTON,
                         "visible", TRUE,
                         "action-name", flags == GTK_PLACES_OPEN_NORMAL ? "row.open" : "row.open-other",
                         "action-target", g_variant_new_int32 (flags),
                         "text", label,
-@@ -3406,10 +3433,17 @@
+@@ -3600,10 +3627,17 @@
    setup_popover_shadowing (sidebar->popover);
    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    g_object_set (box, "margin", 10, NULL);
    gtk_widget_show (box);
    gtk_container_add (GTK_CONTAINER (sidebar->popover), box);
 +  if (!sidebar->populate_all)
-+  {
-+    sidebar->popover = gtk_menu_new();
-+    g_signal_connect (sidebar->popover, "destroy", G_CALLBACK (on_row_popover_destroy), sidebar);
-+    gtk_menu_attach_to_widget(GTK_MENU(sidebar->popover), GTK_WIDGET(sidebar), NULL);
-+    box = sidebar->popover;
-+  }
++    {
++      sidebar->popover = gtk_menu_new ();
++      g_signal_connect (sidebar->popover, "destroy", G_CALLBACK (on_row_popover_destroy), sidebar);
++      gtk_menu_attach_to_widget (GTK_MENU (sidebar->popover), GTK_WIDGET (sidebar), NULL);
++      box = sidebar->popover;
++    }
  
    add_open_button (box, _("_Open"), GTK_PLACES_OPEN_NORMAL);
  
    if (sidebar->open_flags & GTK_PLACES_OPEN_NEW_TAB)
      add_open_button (box, _("Open in New _Tab"), GTK_PLACES_OPEN_NEW_TAB);
-@@ -3429,10 +3463,19 @@
+@@ -3623,10 +3657,19 @@
    data.unmount_item = add_button (box, _("_Unmount"), "row.unmount");
    data.eject_item = add_button (box, _("_Eject"), "row.eject");
    data.rescan_item = add_button (box, _("_Detect Media"), "row.rescan");
    data.start_item = add_button (box, _("_Start"), "row.start");
    data.stop_item = add_button (box, _("_Stop"), "row.stop");
 +  if (!sidebar->populate_all)
-+  {
-+    g_object_set(
-+      g_list_first(gtk_container_get_children(GTK_CONTAINER(box)))->data,
-+      "image", gtk_image_new_from_icon_name("gtk-open",GTK_ICON_SIZE_MENU), NULL
-+    );
-+    g_object_set(data.remove_item, "image", gtk_image_new_from_icon_name("gtk-remove",GTK_ICON_SIZE_MENU), NULL);
-+    g_object_set(data.add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add",GTK_ICON_SIZE_MENU), NULL);
-+  }
++    {
++      g_object_set (
++        g_list_first (gtk_container_get_children (GTK_CONTAINER (box)))->data,
++        "image", gtk_image_new_from_icon_name ("gtk-open", GTK_ICON_SIZE_MENU), NULL
++      );
++      g_object_set (data.remove_item,       "image", gtk_image_new_from_icon_name("gtk-remove",GTK_ICON_SIZE_MENU), NULL);
++      g_object_set (data.add_shortcut_item, "image", gtk_image_new_from_icon_name("gtk-add",   GTK_ICON_SIZE_MENU), NULL);
++    }
  
    /* Update everything! */
    check_popover_sensitivity (row, &data);
  
    if (sidebar->populate_all)
-@@ -3472,10 +3515,17 @@
+@@ -3666,10 +3709,17 @@
  
    if (sidebar->popover)
      gtk_widget_destroy (sidebar->popover);
  
    create_row_popover (sidebar, row);
-+  if (GTK_IS_MENU(sidebar->popover))
-+  {
-+    sidebar->context_row = row;
-+    gtk_menu_popup_at_pointer(GTK_MENU(sidebar->popover), NULL);
-+    g_object_unref (sidebar);
-+    return;
-+  }
++  if (GTK_IS_MENU (sidebar->popover))
++    {
++      sidebar->context_row = row;
++      gtk_menu_popup_at_pointer (GTK_MENU (sidebar->popover), NULL);
++      g_object_unref (sidebar);
++      return;
++    }
  
    gtk_popover_set_relative_to (GTK_POPOVER (sidebar->popover), GTK_WIDGET (row));