[gtk/file-filter2: 5/6] Drop gtk_file_filter_filter

[Matthias Clasen <matthiasc src gnome org>]

commit f444c66f229cd34839bc7f7982293a40d2dd3a7b
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jul 4 11:06:36 2020 -0400

    Drop gtk_file_filter_filter
    
    It has been superseded by gtk_filter_match.

 docs/reference/gtk/gtk4-sections.txt |  1 -
 gtk/gtkfilefilter.c                  | 30 +++++++-----------------------
 gtk/gtkfilefilter.h                  |  4 +---
 3 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 1e57683eaa..4f54479a24 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1419,7 +1419,6 @@ gtk_file_filter_add_pattern
 gtk_file_filter_add_pixbuf_formats
 gtk_file_filter_add_custom
 gtk_file_filter_get_needed
-gtk_file_filter_filter
 
 <SUBSECTION Serialization>
 gtk_file_filter_new_from_gvariant
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 31aaf1e269..76a0f27d59 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -784,38 +784,22 @@ static gboolean
 gtk_file_filter_match (GtkFilter *filter,
                        gpointer   item)
 {
+  GtkFileFilter *file_filter = GTK_FILE_FILTER (filter);
+  GFileInfo *info = item;
+  GSList *tmp_list;
+  GtkFileFilterFlags contains;
+
   if (!G_IS_FILE_INFO (item))
     return TRUE;
 
-  return gtk_file_filter_filter (GTK_FILE_FILTER (filter), G_FILE_INFO (item));
-}
-
-/**
- * gtk_file_filter_filter:
- * @filter: a #GtkFileFilter
- * @info: the #GFileInfo to filter
- *
- * Tests whether a file should be displayed according to @filter.
- *
- * This function will not typically be used by applications; it
- * is intended principally for use in the implementation of
- * #GtkFileChooser.
- *
- * Returns: %TRUE if the file should be displayed
- **/
-gboolean
-gtk_file_filter_filter (GtkFileFilter *filter,
-                        GFileInfo     *info)
-{
-  GSList *tmp_list;
-  GtkFileFilterFlags contains = GTK_FILE_FILTER_DISPLAY_NAME;
+  contains = GTK_FILE_FILTER_DISPLAY_NAME;
 
   if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE))
     contains |= GTK_FILE_FILTER_MIME_TYPE;
   if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_FILE))
     contains |= GTK_FILE_FILTER_FILENAME | GTK_FILE_FILTER_URI;
 
-  for (tmp_list = filter->rules; tmp_list; tmp_list = tmp_list->next)
+  for (tmp_list = file_filter->rules; tmp_list; tmp_list = tmp_list->next)
     {
       FilterRule *rule = tmp_list->data;
 
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index 0c968e111b..e643f896d3 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -23,6 +23,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gtk/gtkfilter.h>
 #include <glib-object.h>
 #include <gdk/gdk.h>
 
@@ -93,9 +94,6 @@ void gtk_file_filter_add_custom         (GtkFileFilter      *filter,
 
 GDK_AVAILABLE_IN_ALL
 GtkFileFilterFlags gtk_file_filter_get_needed (GtkFileFilter           *filter);
-GDK_AVAILABLE_IN_ALL
-gboolean           gtk_file_filter_filter     (GtkFileFilter           *filter,
-                                               GFileInfo               *info);
 
 GDK_AVAILABLE_IN_ALL
 GVariant      *gtk_file_filter_to_gvariant       (GtkFileFilter *filter);