AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'recent-handle-null-content-type' into 'gtk-3-24'

Browse Source 
gtkrecentfilter: handle g_content_type_from_mime_type() returning NULL

See merge request GNOME/gtk!969
This commit is contained in:
Matthias Clasen 2019-06-30 22:57:15 +00:00
commit 977def8f00
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkrecentfilter.c
View File

@ -746,11 +746,12 @@ gtk_recent_filter_filter (GtkRecentFilter *filter,
if (filter_info->mime_type != NULL) if (filter_info->mime_type != NULL)
{ {
gchar *filter_content_type, *rule_content_type; gchar *filter_content_type, *rule_content_type;
gboolean match; gboolean match = FALSE;
filter_content_type = g_content_type_from_mime_type (filter_info->mime_type); filter_content_type = g_content_type_from_mime_type (filter_info->mime_type);
rule_content_type = g_content_type_from_mime_type (rule->u.mime_type); rule_content_type = g_content_type_from_mime_type (rule->u.mime_type);
match = g_content_type_is_a (filter_content_type, rule_content_type); if (filter_content_type != NULL && rule_content_type != NULL)
match = g_content_type_is_a (filter_content_type, rule_content_type);
g_free (filter_content_type); g_free (filter_content_type);
g_free (rule_content_type); g_free (rule_content_type);