From 5efc8ecd0d09b9ad52da83a24ae0f01418201e15 Mon Sep 17 00:00:00 2001 From: Nikita Zlobin Date: Sun, 17 Feb 2019 11:05:14 +0500 Subject: [PATCH] Fix language guess function --- mousepad/mousepad-file.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mousepad/mousepad-file.c b/mousepad/mousepad-file.c index 3d12f1b..2a09f21 100644 --- a/mousepad/mousepad-file.c +++ b/mousepad/mousepad-file.c @@ -450,24 +450,21 @@ GtkSourceLanguage * mousepad_file_guess_language (MousepadFile *file) { gchar *content_type; - gboolean result_uncertain; + gchar *basename; + gboolean result_uncertain = FALSE; GtkSourceLanguage *language = NULL; - content_type = g_content_type_guess (file->filename, NULL, 0, &result_uncertain); - if (result_uncertain) - { - g_free (content_type); - content_type = NULL; - } - - if (G_LIKELY (content_type != NULL || file->filename != NULL)) + if (file->filename != NULL) { + content_type = g_content_type_guess (file->filename, NULL, 0, &result_uncertain); + basename = g_path_get_basename (file->filename); language = gtk_source_language_manager_guess_language (gtk_source_language_manager_get_default (), - file->filename, - content_type); - } + basename, + result_uncertain ? NULL : content_type); - g_free (content_type); + g_free (basename); + g_free (content_type); + } return language; } -- libgit2 0.26.5