Upstream 3.24.21. Lots of patch work.

21 files changed, 145 insertions, 162 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7ee05c4c7ddf..577568e6fabb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
-# Maintainer: Jonathon Fernyhough <jonathon_at manjaro+dot_org>
-# Upstream maintainer: krumelmonster <krumelmonster@zoho.com>
+# Maintainer: Jonathon Fernyhough <jonathon+m2x.dev>
+# Upstream maintainer: Luke Horwell
 # Contributor: Tomasz Gąsior <tomaszgasior.pl>
 
 # 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="dd59624b448ca6f6e48d4f1268fd3c871a20ae76"
-_gtkver=3.24.14
+_gtkver=3.24.21
 
 pkgbase=gtk3-classic
 pkgname=($pkgbase lib32-$pkgbase)
 pkgver=${_gtkver}
 pkgrel=1
 pkgdesc="GTK3 patched for classic desktops like XFCE or MATE. Please see README."
-url="https://github.com/krumelmonster/gtk3-mushrooms"
-conflicts=(gtk3 gtk3-print-backends)
-provides=(gtk3=$_gtkver gtk3-mushrooms=$_gtkver gtk3-print-backends
+url="https://github.com/lah7/gtk3-mushrooms"
+conflicts=(gtk3 gtk3-typeahead gtk3-print-backends)
+provides=(gtk3=$_gtkver gtk3-typeahead=$_gtkver gtk3-mushrooms=$_gtkver gtk3-print-backends
           libgtk-3.so libgdk-3.so libgailutil-3.so)
 arch=(x86_64)
 license=(LGPL)
@@ -70,35 +70,36 @@ source=(
 	README.md
 )
 sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c'
-            '963d8ac098b4be573897d231acfbb53185bbffae0ecf94861a60271ee664ed0e'
-            '3ccdaf68ed3c557987b984d7ad18a3af1e870e8488cd0fb010568281bcbca092'
-            '16edf7014239d5ae956d5742167f9facbb6b04588be1c9c4644bb745b7eb7e2b'
-            '441e15fdcf3a909628506decdfdaf941e4f812863f2e3e0820e39c61bf93be88'
-            '568cd11b34cbfb593bb0aa4c2ae2d2af13e539a5b3d1aca1d370daf791bb9896'
-            '3c9c57338bb6ae44a772d189dbaccf1a58f6e64704842ade847ff1bbe11e3ccd'
-            '66876362683d2f166842be053c1d324e47df475c1535ff6913ea8245d5a907d9'
-            'a1a0d1a7365e7691c4434628e592a853b8593a417962fa01f7ad4792bb1522e8'
-            '99d899d53565a74c78f139f57cf726c292b77f2b467ab03ef557ac7e575f86ad'
-            '07b3959d1603e5f21f254d01335ff56a5fe5edfec998fd248f12ad925700831d'
-            '102479f46d9c40c553824b5f470fc19b9261e7c45ab0333859c04e2e0447c470'
-            '384f448b71980f32bd298e491434aa0817f5193c07553f1bbdb937e90c990b61'
-            '4386617c929c835c9a94f17a28aa03a4f63f90767cee24c874af77f94efe166d'
-            '03e9c02971f9221df1d28421f76263044d1e1a73e00051fea0a8323c7577f247'
-            'd868f79b37e8c5d032b5f0fd1ea51a8c50996cb5fa2bf693de082215e9f892db'
-            'b4c2dccfb6a1332512c705012be9ffb6bcf07794becda2592c686e9a37054375'
-            '009973688864b30287da1768ee56d92bb26974aa097501aef467f0749801ef7a'
-            'e6517444d9ec7fb76a2d644a55658dae6f94aba67aba5c230f11afefa9271b51'
-            '41080e3632254e50a703dd69f5761784d1545471f8bf3cab1db9eee123957f2f'
-            '07faab98d9ff20f7323846840afe860a7fa4a35e67f949e5c26f73fd997d42d5'
+            '6de32e1bee6bf4307aaec072fc8431b044e73299720a490298b8c1b7c502e039'
+            'c8f6be1df687bf2ccaaeff63fffdc13e2c1d41f89ad1dfa391120c509dba7f33'
+            '760bd3d65b3c5c0be19311d3b9d2be1f33c3bec198bc470de5afe23f5d488b8f'
+            '00927690718c65f6b3c025e2e919028f41cd522c573964dd7fdc31b3022b983f'
+            'db82bc4647eda7cc102590d5cfffd8524cf126a704358096e0e66f5c068fe46f'
+            'f29097aaa6fb8b99ce1a4659856dbc290d299befb1b09fd6158cbb3f539d890c'
+            '110d2a2d8fc8f3f4ad1b40abd319f18fbb571b1f1bc121de1a8e0037eb3d9df8'
+            'caa4da5e786a38e788617d6c9a844dfc604038d2a5d57033273859cad46d14cd'
+            'cf26ab623fec6fc4f24628bdbe4b81ba5f56e8e0c61de78474d5c2411901931a'
+            '57b7b7725b9afe24dc29c6315e3162f297632525b32e329e18b32aba1112eed2'
+            'c6fd146e7ab332dd9a394b666b19e6ba7d6ac0932f33fb396f66630134257309'
+            '54fb3a39475644abaded2ac2db32c72ce8c36ee7b98ced0ee52a3f89dcac8d83'
+            '7157b665e2ae724bb6abe8fc382d7178dc4d8d00f29bc63ed2942307ff41914b'
+            '2b10b436ebcf8c124fac6e7867f0bf0573ecfb70130893fea37724c5f6719caf'
+            'eba56921250bbf6767dab9de219bf81763ed7891014d76c3a1fe6c82c32b7359'
+            '570b2d6ada08c007ba3771a86863ea438cbc03e78997773782c742cacbe7fd8b'
+            '9761a289cf93558ec67bb498b765ccb757027b10071da938ff14fca695a0103d'
+            'bf0e188ba6cfb24b506e4eab7e62a020348cce307d4eecde571227a058c441ad'
+            '17aa98262b96817396c74c303c83eee2a0c9c94b10e31d8de48a44cb17b08dc1'
+            'af2d2d4a0d876f9abc350a1cdb09ffc016a8894ee3c46030c3d90c6e99b27c5a'
             'ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31'
-            '1c4d69f93ab884fd80c6b95115bfbc12d51ecd029178b6dad3672fdc5ff91e88'
+            'aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52'
             '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
             'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
             '1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada')
 
 prepare()
 {
-	QUILT_PATCHES=. quilt push -av
+	cd gtk+-$_gtkver
+	QUILT_PATCHES=.. quilt push -av
 
 	rm -f "$srcdir"/gtk+-"$_gtkver"/gtk/theme/Adwaita/gtk-contained{,-dark}.css
 	cat "$srcdir/smaller-adwaita.css" | tee -a "$srcdir"/gtk+-"$_gtkver"/gtk/theme/Adwaita/gtk-contained{,-dark}.css > /dev/null
@@ -131,6 +132,7 @@ build()
 		-D colord=no \
 		-D demos=false \
 		-D examples=false \
+		-D introspection=false \
 		-D tests=false \
 		-D installed_tests=false \
 		-D libdir=/usr/lib32
diff --git a/appearance__buttons-menus-icons.patch b/appearance__buttons-menus-icons.patch
index 40e209268bfa..201d80f2d994 100644
--- a/appearance__buttons-menus-icons.patch
+++ b/appearance__buttons-menus-icons.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkbutton.c
+Index: b/gtk/gtkbutton.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkbutton.c
-+++ b/gtk+-3.24.14/gtk/gtkbutton.c
+--- a/gtk/gtkbutton.c
++++ b/gtk/gtkbutton.c
 @@ -2164,6 +2164,27 @@ gtk_button_set_label (GtkButton   *butto
    g_return_if_fail (GTK_IS_BUTTON (button));
  
@@ -30,10 +30,10 @@ Index: b/gtk+-3.24.14/gtk/gtkbutton.c
  
    new_label = g_strdup (label);
    g_free (priv->label_text);
-Index: b/gtk+-3.24.14/gtk/gtkmenuitem.c
+Index: b/gtk/gtkmenuitem.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkmenuitem.c
-+++ b/gtk+-3.24.14/gtk/gtkmenuitem.c
+--- a/gtk/gtkmenuitem.c
++++ b/gtk/gtkmenuitem.c
 @@ -1010,6 +1010,20 @@ gtk_menu_item_new_with_label (const gcha
  GtkWidget*
  gtk_menu_item_new_with_mnemonic (const gchar *label)
diff --git a/appearance__disable-backdrop.patch b/appearance__disable-backdrop.patch
index 646d64e1c51e..7f83409a19c0 100644
--- a/appearance__disable-backdrop.patch
+++ b/appearance__disable-backdrop.patch
@@ -1,8 +1,8 @@
-Index: b/gtk+-3.24.14/gtk/gtkwindow.c
+Index: b/gtk/gtkwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkwindow.c
-@@ -8004,7 +8004,7 @@ gtk_window_state_event (GtkWidget
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -8017,7 +8017,7 @@ gtk_window_state_event (GtkWidget
    GtkWindow *window = GTK_WINDOW (widget);
    GtkWindowPrivate *priv = window->priv;
  
diff --git a/appearance__file-chooser.patch b/appearance__file-chooser.patch
index bfc7f0594553..5681fcfe0f6d 100644
--- a/appearance__file-chooser.patch
+++ b/appearance__file-chooser.patch
@@ -1,8 +1,8 @@
-Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
+Index: b/gtk/gtkfilechooserwidget.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
-+++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
-@@ -78,6 +78,7 @@
+--- a/gtk/gtkfilechooserwidget.c
++++ b/gtk/gtkfilechooserwidget.c
+@@ -79,6 +79,7 @@
  #include "gtkseparator.h"
  #include "gtkmodelbutton.h"
  #include "gtkgesturelongpress.h"
@@ -10,7 +10,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
  
  #include <cairo-gobject.h>
  
-@@ -8797,6 +8798,16 @@ post_process_ui (GtkFileChooserWidget *i
+@@ -8826,6 +8827,16 @@ post_process_ui (GtkFileChooserWidget *i
    gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view);
  
    add_actions (impl);
diff --git a/appearance__message-dialogs.patch b/appearance__message-dialogs.patch
index e3334403e73f..1b993d84c8a9 100644
--- a/appearance__message-dialogs.patch
+++ b/appearance__message-dialogs.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkdialog.c
+Index: b/gtk/gtkdialog.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkdialog.c
-+++ b/gtk+-3.24.14/gtk/gtkdialog.c
+--- a/gtk/gtkdialog.c
++++ b/gtk/gtkdialog.c
 @@ -700,12 +700,12 @@ update_spacings (GtkDialog *dialog)
  
    /* don't set spacing when buttons are linked */
@@ -17,10 +17,10 @@ Index: b/gtk+-3.24.14/gtk/gtkdialog.c
        _gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE);
      }
  }
-Index: b/gtk+-3.24.14/gtk/gtkmessagedialog.c
+Index: b/gtk/gtkmessagedialog.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkmessagedialog.c
-+++ b/gtk+-3.24.14/gtk/gtkmessagedialog.c
+--- a/gtk/gtkmessagedialog.c
++++ b/gtk/gtkmessagedialog.c
 @@ -37,6 +37,7 @@
  #include "gtkintl.h"
  #include "gtkprivate.h"
@@ -92,10 +92,10 @@ Index: b/gtk+-3.24.14/gtk/gtkmessagedialog.c
    atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
    if (GTK_IS_ACCESSIBLE (atk_obj))
      {
-Index: b/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
+Index: b/gtk/ui/gtkmessagedialog.ui
 ===================================================================
---- a/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
-+++ b/gtk+-3.24.14/gtk/ui/gtkmessagedialog.ui
+--- a/gtk/ui/gtkmessagedialog.ui
++++ b/gtk/ui/gtkmessagedialog.ui
 @@ -6,6 +6,7 @@
      <property name="resizable">0</property>
      <property name="type-hint">dialog</property>
diff --git a/appearance__print-dialog.patch b/appearance__print-dialog.patch
index f492aaec53f7..cc5ad6650f9e 100644
--- a/appearance__print-dialog.patch
+++ b/appearance__print-dialog.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkprintunixdialog.c
+Index: b/gtk/gtkprintunixdialog.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkprintunixdialog.c
-+++ b/gtk+-3.24.14/gtk/gtkprintunixdialog.c
+--- a/gtk/gtkprintunixdialog.c
++++ b/gtk/gtkprintunixdialog.c
 @@ -750,6 +750,11 @@ gtk_print_unix_dialog_init (GtkPrintUnix
    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
    widget = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -14,10 +14,10 @@ Index: b/gtk+-3.24.14/gtk/gtkprintunixdialog.c
  
    /* Treeview auxiliary functions need to be setup here */
    gtk_tree_model_filter_set_visible_func (priv->printer_list_filter,
-Index: b/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
+Index: b/gtk/ui/gtkprintunixdialog.ui
 ===================================================================
---- a/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
-+++ b/gtk+-3.24.14/gtk/ui/gtkprintunixdialog.ui
+--- a/gtk/ui/gtkprintunixdialog.ui
++++ b/gtk/ui/gtkprintunixdialog.ui
 @@ -48,6 +48,7 @@
      <property name="step-increment">1</property>
    </object>
diff --git a/appearance__smaller-statusbar.patch b/appearance__smaller-statusbar.patch
index 1f87af5be657..ed423e1ef34b 100644
--- a/appearance__smaller-statusbar.patch
+++ b/appearance__smaller-statusbar.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
+Index: b/gtk/ui/gtkstatusbar.ui
 ===================================================================
---- a/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
-+++ b/gtk+-3.24.14/gtk/ui/gtkstatusbar.ui
+--- a/gtk/ui/gtkstatusbar.ui
++++ b/gtk/ui/gtkstatusbar.ui
 @@ -5,8 +5,8 @@
      <property name="spacing">2</property>
      <property name="margin-start">10</property>
diff --git a/csd__clean-headerbar.patch b/csd__clean-headerbar.patch
index ea6d6ea6e907..09612d4ab68e 100644
--- a/csd__clean-headerbar.patch
+++ b/csd__clean-headerbar.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkheaderbar.c
+Index: b/gtk/gtkheaderbar.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkheaderbar.c
-+++ b/gtk+-3.24.14/gtk/gtkheaderbar.c
+--- a/gtk/gtkheaderbar.c
++++ b/gtk/gtkheaderbar.c
 @@ -300,6 +300,27 @@ _gtk_header_bar_update_window_buttons (G
  
    priv->titlebar_icon = NULL;
@@ -59,11 +59,11 @@ Index: b/gtk+-3.24.14/gtk/gtkheaderbar.c
  }
  
  /**
-Index: b/gtk+-3.24.14/gtk/gtkwindow.c
+Index: b/gtk/gtkwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkwindow.c
-@@ -4168,6 +4168,8 @@ on_titlebar_title_notify (GtkHeaderBar *
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -4174,6 +4174,8 @@ on_titlebar_title_notify (GtkHeaderBar *
    const gchar *title;
  
    title = gtk_header_bar_get_title (titlebar);
@@ -72,7 +72,7 @@ Index: b/gtk+-3.24.14/gtk/gtkwindow.c
    gtk_window_set_title_internal (self, title, FALSE);
  }
  
-@@ -9353,6 +9355,7 @@ static void
+@@ -9366,6 +9368,7 @@ static void
  gtk_window_do_popup (GtkWindow      *window,
                       GdkEventButton *event)
  {
diff --git a/csd__disabled-by-default.patch b/csd__disabled-by-default.patch
index 9729a444c5ce..fc6b85221b70 100644
--- a/csd__disabled-by-default.patch
+++ b/csd__disabled-by-default.patch
@@ -1,8 +1,8 @@
-Index: b/gtk+-3.24.14/gtk/gtkwindow.c
+Index: b/gtk/gtkwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkwindow.c
-@@ -4158,6 +4158,14 @@ gtk_window_enable_csd (GtkWindow *window
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -4164,6 +4164,14 @@ gtk_window_enable_csd (GtkWindow *window
      }
  
    priv->client_decorated = TRUE;
diff --git a/csd__server-side-shadow.patch b/csd__server-side-shadow.patch
index a77ef61a2c7e..602ae262602e 100644
--- a/csd__server-side-shadow.patch
+++ b/csd__server-side-shadow.patch
@@ -1,8 +1,8 @@
-Index: b/gtk+-3.24.14/gtk/gtkwindow.c
+Index: b/gtk/gtkwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkwindow.c
-@@ -4107,6 +4107,8 @@ gtk_window_supports_client_shadow (GtkWi
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -4113,6 +4113,8 @@ gtk_window_supports_client_shadow (GtkWi
  #ifdef GDK_WINDOWING_X11
    if (GDK_IS_X11_DISPLAY (display))
      {
diff --git a/file-chooser__places-sidebar.patch b/file-chooser__places-sidebar.patch
index 8f623b2278a2..b3735805e74c 100644
--- a/file-chooser__places-sidebar.patch
+++ b/file-chooser__places-sidebar.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkplacessidebar.c
+Index: b/gtk/gtkplacessidebar.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkplacessidebar.c
-+++ b/gtk+-3.24.14/gtk/gtkplacessidebar.c
+--- a/gtk/gtkplacessidebar.c
++++ b/gtk/gtkplacessidebar.c
 @@ -633,6 +633,7 @@ open_home (GtkPlacesSidebar *sidebar)
  static void
  add_special_dirs (GtkPlacesSidebar *sidebar)
@@ -46,10 +46,10 @@ Index: b/gtk+-3.24.14/gtk/gtkplacessidebar.c
    sidebar->hostnamed_cancellable = g_cancellable_new ();
    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
                              G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-Index: b/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
+Index: b/gtk/ui/gtkfilechooserwidget.ui
 ===================================================================
---- a/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
-+++ b/gtk+-3.24.14/gtk/ui/gtkfilechooserwidget.ui
+--- a/gtk/ui/gtkfilechooserwidget.ui
++++ b/gtk/ui/gtkfilechooserwidget.ui
 @@ -16,7 +16,8 @@
                  <property name="visible">1</property>
                  <property name="hscrollbar-policy">never</property>
diff --git a/file-chooser__typeahead.patch b/file-chooser__typeahead.patch
index 399d85d662ed..fa0ac10a4cd3 100644
--- a/file-chooser__typeahead.patch
+++ b/file-chooser__typeahead.patch
@@ -1,8 +1,8 @@
-Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
+Index: b/gtk/gtkfilechooserwidget.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
-+++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
-@@ -1419,7 +1419,7 @@ gtk_file_chooser_widget_key_press_event
+--- a/gtk/gtkfilechooserwidget.c
++++ b/gtk/gtkfilechooserwidget.c
+@@ -1423,7 +1423,7 @@ gtk_file_chooser_widget_key_press_event
            return TRUE;
          }
      }
@@ -11,7 +11,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
      {
        if (priv->operation_mode != OPERATION_MODE_SEARCH)
          operation_mode_set (impl, OPERATION_MODE_SEARCH);
-@@ -2477,7 +2477,7 @@ file_list_set_sort_column_ids (GtkFileCh
+@@ -2493,7 +2493,7 @@ file_list_set_sort_column_ids (GtkFileCh
  {
    GtkFileChooserWidgetPrivate *priv = impl->priv;
  
@@ -20,7 +20,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
  
    gtk_tree_view_column_set_sort_column_id (priv->list_name_column, MODEL_COL_NAME);
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, MODEL_COL_TIME);
-@@ -7319,8 +7319,6 @@ search_engine_hits_added_cb (GtkSearchEn
+@@ -7347,8 +7347,6 @@ search_engine_hits_added_cb (GtkSearchEn
    GFile *file;
    gboolean select = FALSE;
  
@@ -29,7 +29,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
  
    files = NULL;
    files_with_info = NULL;
-@@ -7664,7 +7662,7 @@ recent_idle_cleanup (gpointer data)
+@@ -7693,7 +7691,7 @@ recent_idle_cleanup (gpointer data)
  
    gtk_tree_view_set_model (GTK_TREE_VIEW (priv->browse_files_tree_view),
                             GTK_TREE_MODEL (priv->recent_model));
@@ -38,7 +38,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
  
    gtk_tree_view_column_set_sort_column_id (priv->list_name_column, -1);
    gtk_tree_view_column_set_sort_column_id (priv->list_time_column, -1);
-@@ -8617,10 +8615,6 @@ gtk_file_chooser_widget_class_init (GtkF
+@@ -8646,10 +8644,6 @@ gtk_file_chooser_widget_class_init (GtkF
                                  "search-shortcut",
                                  0);
    gtk_binding_entry_add_signal (binding_set,
@@ -49,7 +49,7 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
                                  GDK_KEY_r, GDK_MOD1_MASK,
                                  "recent-shortcut",
                                  0);
-@@ -8741,6 +8735,7 @@ post_process_ui (GtkFileChooserWidget *i
+@@ -8770,6 +8764,7 @@ post_process_ui (GtkFileChooserWidget *i
    g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl);
  
    /* Setup file list treeview */
diff --git a/fixes__atk-bridge-errors.patch b/fixes__atk-bridge-errors.patch
index 9b3e1bd19b26..0b944a0dcb58 100644
--- a/fixes__atk-bridge-errors.patch
+++ b/fixes__atk-bridge-errors.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
+Index: b/gtk/a11y/gtkaccessibility.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
-+++ b/gtk+-3.24.14/gtk/a11y/gtkaccessibility.c
+--- a/gtk/a11y/gtkaccessibility.c
++++ b/gtk/a11y/gtkaccessibility.c
 @@ -989,7 +989,10 @@ _gtk_accessibility_init (void)
    do_window_event_initialization ();
  
diff --git a/fixes__labels-wrapping.patch b/fixes__labels-wrapping.patch
index 2a77e41f3c55..3f8d73426e28 100644
--- a/fixes__labels-wrapping.patch
+++ b/fixes__labels-wrapping.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtklabel.c
+Index: b/gtk/gtklabel.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtklabel.c
-+++ b/gtk+-3.24.14/gtk/gtklabel.c
+--- a/gtk/gtklabel.c
++++ b/gtk/gtklabel.c
 @@ -3685,6 +3685,14 @@ gtk_label_get_preferred_layout_size (Gtk
    GtkLabelPrivate *priv = label->priv;
    PangoLayout *layout;
diff --git a/fixes__too-large-menu-covers-bar.disabled-patch b/fixes__too-large-menu-covers-bar.disabled-patch
index 27566c4797fe..6bdbc7de42c4 100644
--- a/fixes__too-large-menu-covers-bar.disabled-patch
+++ b/fixes__too-large-menu-covers-bar.disabled-patch
@@ -1,6 +1,6 @@
 diff --color -U 5 -r -Z -B gtk/gtkmenu.c gtk/gtkmenu.c
---- src/gtk+-3.24.14/gtk/gtkmenu.c	2018-01-31 18:37:18.000000000 +0100
-+++ src/gtk+-3.24.14/gtk/gtkmenu.c	2018-07-16 23:43:51.061469725 +0200
+--- src/gtk/gtkmenu.c	2018-01-31 18:37:18.000000000 +0100
++++ src/gtk/gtkmenu.c	2018-07-16 23:43:51.061469725 +0200
 @@ -1393,10 +1393,17 @@
                    const GdkRectangle *final_rect,
                    gboolean            flipped_x,
diff --git a/other__default-settings.patch b/other__default-settings.patch
index 343c675ded93..f92efa2564fe 100644
--- a/other__default-settings.patch
+++ b/other__default-settings.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkscrolledwindow.c
+Index: b/gtk/gtkscrolledwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkscrolledwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkscrolledwindow.c
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
 @@ -4448,7 +4448,7 @@ gtk_scrolled_window_update_use_indicator
  
    use_indicators = overlay_scrolling && priv->overlay_scrolling;
@@ -11,23 +11,23 @@ Index: b/gtk+-3.24.14/gtk/gtkscrolledwindow.c
      use_indicators = FALSE;
  
    if (priv->use_indicators != use_indicators)
-Index: b/gtk+-3.24.14/gtk/gtksettings.c
+Index: b/gtk/gtksettings.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtksettings.c
-+++ b/gtk+-3.24.14/gtk/gtksettings.c
+--- a/gtk/gtksettings.c
++++ b/gtk/gtksettings.c
 @@ -61,7 +61,7 @@
  #ifdef GDK_WINDOWING_QUARTZ
- #define PRINT_PREVIEW_COMMAND "open -a /Applications/Preview.app %f"
+ #define PRINT_PREVIEW_COMMAND "open -b com.apple.Preview %f"
  #else
 -#define PRINT_PREVIEW_COMMAND "evince --unlink-tempfile --preview --print-settings %s %f"
 +#define PRINT_PREVIEW_COMMAND "atril --unlink-tempfile --preview --print-settings %s %f"
  #endif
  
  /**
-Index: b/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
+Index: b/gtk/org.gtk.Settings.FileChooser.gschema.xml
 ===================================================================
---- a/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
-+++ b/gtk+-3.24.14/gtk/org.gtk.Settings.FileChooser.gschema.xml
+--- a/gtk/org.gtk.Settings.FileChooser.gschema.xml
++++ b/gtk/org.gtk.Settings.FileChooser.gschema.xml
 @@ -133,7 +133,7 @@
        </description>
      </key>
diff --git a/other__hide-insert-emoji.patch b/other__hide-insert-emoji.patch
index e4ea53d9f230..98068a5a3dd5 100644
--- a/other__hide-insert-emoji.patch
+++ b/other__hide-insert-emoji.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkentry.c
+Index: b/gtk/gtkentry.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkentry.c
-+++ b/gtk+-3.24.14/gtk/gtkentry.c
+--- a/gtk/gtkentry.c
++++ b/gtk/gtkentry.c
 @@ -9626,7 +9626,8 @@ popup_targets_received (GtkClipboard
            g_signal_connect_swapped (menuitem, "activate",
                                      G_CALLBACK (gtk_entry_insert_emoji), entry);
@@ -12,10 +12,10 @@ Index: b/gtk+-3.24.14/gtk/gtkentry.c
          }
  
        g_signal_emit (entry, signals[POPULATE_POPUP], 0, menu);
-Index: b/gtk+-3.24.14/gtk/gtktextview.c
+Index: b/gtk/gtktextview.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtktextview.c
-+++ b/gtk+-3.24.14/gtk/gtktextview.c
+--- a/gtk/gtktextview.c
++++ b/gtk/gtktextview.c
 @@ -9537,7 +9537,8 @@ popup_targets_received (GtkClipboard
            g_signal_connect_swapped (menuitem, "activate",
                                      G_CALLBACK (gtk_text_view_insert_emoji), text_view);
diff --git a/other__mnemonics-delay.patch b/other__mnemonics-delay.patch
index 3b0623e40a18..54fb51039778 100644
--- a/other__mnemonics-delay.patch
+++ b/other__mnemonics-delay.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkwindow.c
+Index: b/gtk/gtkwindow.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkwindow.c
-+++ b/gtk+-3.24.14/gtk/gtkwindow.c
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
 @@ -147,7 +147,7 @@
   * widget that is added as a titlebar child.
   */
diff --git a/popovers__color-chooser.patch b/popovers__color-chooser.patch
index 61b239acc4a6..c26b2b49aeaa 100644
--- a/popovers__color-chooser.patch
+++ b/popovers__color-chooser.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkcolorswatch.c
+Index: b/gtk/gtkcolorswatch.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkcolorswatch.c
-+++ b/gtk+-3.24.14/gtk/gtkcolorswatch.c
+--- a/gtk/gtkcolorswatch.c
++++ b/gtk/gtkcolorswatch.c
 @@ -349,6 +349,17 @@ do_popup (GtkColorSwatch *swatch)
  {
    if (swatch->priv->popover == NULL)
diff --git a/popovers__file-chooser-list.patch b/popovers__file-chooser-list.patch
index 9863826ac0da..43235b507e33 100644
--- a/popovers__file-chooser-list.patch
+++ b/popovers__file-chooser-list.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
+Index: b/gtk/gtkfilechooserwidget.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
-+++ b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
+--- a/gtk/gtkfilechooserwidget.c
++++ b/gtk/gtkfilechooserwidget.c
 @@ -29,6 +29,7 @@
  #include "gtkcellrendererpixbuf.h"
  #include "gtkcellrenderertext.h"
@@ -10,62 +10,43 @@ Index: b/gtk+-3.24.14/gtk/gtkfilechooserwidget.c
  #include "gtkclipboard.h"
  #include "gtkcomboboxtext.h"
  #include "gtkdragsource.h"
-@@ -2268,15 +2269,9 @@ append_separator (GtkWidget *box)
+@@ -2281,6 +2282,10 @@ append_separator (GtkWidget *box)
  {
    GtkWidget *separator;
  
--  separator = g_object_new (GTK_TYPE_SEPARATOR,
--                            "orientation", GTK_ORIENTATION_HORIZONTAL,
--                            "visible", TRUE,
--                            "margin-start", 12,
--                            "margin-end", 12,
--                            "margin-top", 6,
--                            "margin-bottom", 6,
--                            NULL);
--  gtk_container_add (GTK_CONTAINER (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;
- }
-@@ -2289,12 +2284,14 @@ add_button (GtkWidget   *box,
++  return separator;
+   separator = g_object_new (GTK_TYPE_SEPARATOR,
+                             "orientation", GTK_ORIENTATION_HORIZONTAL,
+                             "visible", TRUE,
+@@ -2302,6 +2307,14 @@ add_button (GtkWidget   *box,
  {
    GtkWidget *item;
  
-- item = g_object_new (GTK_TYPE_MODEL_BUTTON,
--                       "visible", TRUE,
--                       "action-name", action,
--                       "text", label,
--                       NULL);
--  gtk_container_add (GTK_CONTAINER (box), item);
 +  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);
- 
-   return item;
- }
-@@ -2308,11 +2305,9 @@ file_list_build_popover (GtkFileChooserW
-   if (priv->browse_files_popover)
-     return;
- 
--  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);
++  return item;
+  item = g_object_new (GTK_TYPE_MODEL_BUTTON,
+                        "visible", TRUE,
+                        "action-name", action,
+@@ -2326,6 +2339,9 @@ file_list_build_popover (GtkFileChooserW
+   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);
 +  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");
-@@ -2329,6 +2324,12 @@ file_list_build_popover (GtkFileChooserW
+@@ -2342,6 +2358,12 @@ file_list_build_popover (GtkFileChooserW
    priv->type_column_item = add_button (box, _("Show T_ype Column"), "item.toggle-show-type");
    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");
diff --git a/popovers__places-sidebar.patch b/popovers__places-sidebar.patch
index 65e3770fcffe..be8566da7839 100644
--- a/popovers__places-sidebar.patch
+++ b/popovers__places-sidebar.patch
@@ -1,7 +1,7 @@
-Index: b/gtk+-3.24.14/gtk/gtkplacessidebar.c
+Index: b/gtk/gtkplacessidebar.c
 ===================================================================
---- a/gtk+-3.24.14/gtk/gtkplacessidebar.c
-+++ b/gtk+-3.24.14/gtk/gtkplacessidebar.c
+--- a/gtk/gtkplacessidebar.c
++++ b/gtk/gtkplacessidebar.c
 @@ -64,6 +64,7 @@
  #include "gtkgesturelongpress.h"
  #include "gtkbox.h"