HybridDog
/
geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove wrong UTF-8 conversion in filetypes_get_from_filename(). 

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1455 ea778897-0a13-0410-b9d1-a72fbfd435f5
master
Nick Treleaven 2007-04-16 11:10:22 +00:00
parent c4ece8e758
commit 05164ab8ae
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-16 Nick Treleaven <nick.treleaven@btinternet.com>
* src/filetypes.c:
Remove wrong UTF-8 conversion in filetypes_get_from_filename().
2007-04-15 Enrico Tröger <enrico.troeger@uvena.de>
* geany.glade, data/filetypes.*, doc/geany.docbook, src/callbacks.c,

14
src/filetypes.c
View File

@ -686,8 +686,8 @@ filetype *filetypes_get_from_filename(gint idx)
{
GPatternSpec *pattern;
filetype *ft;
gchar *filename;
gchar *base_filename, *utf8_filename;
const gchar *utf8_filename;
gchar *base_filename;
gint i, j;
if (! DOC_IDX_VALID(idx))
@ -700,18 +700,10 @@ filetype *filetypes_get_from_filename(gint idx)
if (doc_list[idx].file_name == NULL)
return filetypes[GEANY_FILETYPES_ALL];
else
filename = doc_list[idx].file_name;
// try to get the UTF-8 equivalent for the filename
utf8_filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL);
if (utf8_filename == NULL)
{
return filetypes[GEANY_FILETYPES_ALL];
}
utf8_filename = doc_list[idx].file_name;
// to match against the basename of the file(because of Makefile*)
base_filename = g_path_get_basename(utf8_filename);
g_free(utf8_filename);
for(i = 0; i < GEANY_MAX_FILE_TYPES; i++)
{