[nautilus] gtk: Update to the latest codes

[Ondrej Holy <oholy src gnome org>]

commit 8e295e3a6cd05d703861a3320c9b56986440f177
Author: Ondrej Holy <oholy redhat com>
Date:   Thu Jul 2 13:34:37 2020 +0200

    gtk: Update to the latest codes
    
    GTK-based codes are not up-to-date. Let's run gtk-code-generator.sh
    to update them. But also update the script to remove the unwanted
    marshalers. Finally, this doesn't bring any functional changes, but
    it adapts our script to the latest GTK codes. Let's add a comment
    in meson.build to not forget doing this regularly...

 meson.build                     | 6 +++++-
 src/gtk/gtk-code-generator.sh   | 2 ++
 src/gtk/nautilusgtkplacesview.c | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 374327344..e42ddf858 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,11 @@
 project('nautilus', 'c',
   default_options: ['c_std=c11'],
-  # Do not forget to update release version in appdata file when releasing
+
+  # Do not forget when releasing:
+  #  * Update version in data/org.gnome.Nautilus.appdata.xml.in.in
+  #  * Update GTK-based codes over src/gtk/gtk-code-generator.sh
   version: '3.37.3',
+
   meson_version: '>= 0.47.0',
   license: 'GPL3+'
 )
diff --git a/src/gtk/gtk-code-generator.sh b/src/gtk/gtk-code-generator.sh
index 0a8ef70af..147efb3bd 100755
--- a/src/gtk/gtk-code-generator.sh
+++ b/src/gtk/gtk-code-generator.sh
@@ -34,6 +34,8 @@ update_file () {
         -e 's/GTK_IS_PLACES_VIEW/NAUTILUS_IS_GTK_PLACES_VIEW/g' \
         -e 's/_gtk_marshal_VOID__STRING_STRING/NULL/g' \
         -e '/gtkmarshalers.h/d' \
+        -e '/g_signal_set_va_marshaller/,+2d' \
+        -e 's/_gtk_marshal_VOID__OBJECT_FLAGS/NULL/g' \
         -e '/"config.h"/a #include <glib\/gi18n.h>' \
         -e "s/P_(\(.*\))/\1/" \
         -e "s/I_(\(.*\))/\1/" \
diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
index 11735a8a1..af05540f2 100644
--- a/src/gtk/nautilusgtkplacesview.c
+++ b/src/gtk/nautilusgtkplacesview.c
@@ -2283,7 +2283,8 @@ nautilus_gtk_places_view_class_init (NautilusGtkPlacesViewClass *klass)
                         G_OBJECT_CLASS_TYPE (object_class),
                         G_SIGNAL_RUN_FIRST,
                         G_STRUCT_OFFSET (NautilusGtkPlacesViewClass, open_location),
-                        NULL, NULL, NULL,
+                        NULL, NULL,
+                        NULL,
                         G_TYPE_NONE, 2,
                         G_TYPE_OBJECT,
                         GTK_TYPE_PLACES_OPEN_FLAGS);