summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Westman <james@jwestman.net>2022-03-17 10:49:39 -0500
committerMatthias Clasen <mclasen@redhat.com>2022-03-17 16:18:28 -0400
commit1f00cdc7a65b12329ecfa6719eff816edfa11bac (patch)
tree5d94251854fb0b68d6389b8a0a3b1f9ac3378813
parent3e4bfa2bae9c6e90005b57d9f9fe47d2301f0e0e (diff)
downloadgtk+-1f00cdc7a65b12329ecfa6719eff816edfa11bac.tar.gz
filefilter: Fix <suffixes> in buildable
A bug in GtkFileFilter's GtkBuildable implementation caused the <suffixes> tag not to be recognized.
-rw-r--r--gtk/gtkfilefilter.c6
-rw-r--r--testsuite/gtk/ui/filefilter1.ui4
2 files changed, 8 insertions, 2 deletions
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index ae45ad72a4..c9a4d3040a 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -283,7 +283,8 @@ parser_start_element (GtkBuildableParseContext *context,
}
if (strcmp (element_name, "mime-types") == 0 ||
- strcmp (element_name, "patterns") == 0)
+ strcmp (element_name, "patterns") == 0 ||
+ strcmp (element_name, "suffixes") == 0)
{
if (!_gtk_builder_check_parent (data->builder, context, "object", error))
return;
@@ -422,7 +423,8 @@ gtk_file_filter_buildable_custom_tag_end (GtkBuildable *buildable,
gpointer user_data)
{
if (strcmp (tagname, "mime-types") == 0 ||
- strcmp (tagname, "patterns") == 0)
+ strcmp (tagname, "patterns") == 0 ||
+ strcmp (tagname, "suffixes") == 0)
{
SubParserData *data = (SubParserData*)user_data;
diff --git a/testsuite/gtk/ui/filefilter1.ui b/testsuite/gtk/ui/filefilter1.ui
index f8df737720..85acb18b9a 100644
--- a/testsuite/gtk/ui/filefilter1.ui
+++ b/testsuite/gtk/ui/filefilter1.ui
@@ -9,5 +9,9 @@
<pattern>*.txt</pattern>
<pattern>*.png</pattern>
</patterns>
+ <suffixes>
+ <suffix>txt</suffix>
+ <suffix>png</suffix>
+ </suffixes>
</object>
</interface>