From c4183ed568e23436901eab75961cadaf1eba2b3d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 8 Nov 2004 21:25:27 +0000 Subject: Use xdg_mime_mime_type_subclass() to match mime types. This also gives use 2004-11-08 Matthias Clasen * gtk/gtkfilefilter.c (gtk_file_filter_filter): Use xdg_mime_mime_type_subclass() to match mime types. This also gives use wildcard matching. (#143760, #141224, Tommi Komulainen, David A Knight) --- gtk/xdgmime/ChangeLog | 3 +++ gtk/xdgmime/xdgmime.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'gtk/xdgmime') diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index d5fa32368f..5841b98a77 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -1,5 +1,8 @@ 2004-11-08 Matthias Clasen + * xdgmime.c (xdg_mime_mime_type_subclass): Enable matching + of supertypes as text/*. + * Sync from upstream 2004-10-27 Matthias Clasen diff --git a/gtk/xdgmime/xdgmime.c b/gtk/xdgmime/xdgmime.c index df618b2798..df59f26834 100644 --- a/gtk/xdgmime/xdgmime.c +++ b/gtk/xdgmime/xdgmime.c @@ -573,7 +573,7 @@ xdg_mime_media_type_equal (const char *mime_a, return 0; } -#if 0 +#if 1 static int xdg_mime_is_super_type (const char *mime) { @@ -605,7 +605,10 @@ xdg_mime_mime_type_subclass (const char *mime, if (strcmp (umime, ubase) == 0) return 1; -#if 0 + /* We really want to handle text/* in GtkFileFilter, so we just + * turn on the supertype matching + */ +#if 1 /* Handle supertypes */ if (xdg_mime_is_super_type (ubase) && xdg_mime_media_type_equal (umime, ubase)) -- cgit v1.2.1