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-a72fbfd435f5master
parent
c4ece8e758
commit
05164ab8ae
|
@ -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>
|
2007-04-15 Enrico Tröger <enrico.troeger@uvena.de>
|
||||||
|
|
||||||
* geany.glade, data/filetypes.*, doc/geany.docbook, src/callbacks.c,
|
* geany.glade, data/filetypes.*, doc/geany.docbook, src/callbacks.c,
|
||||||
|
|
|
@ -686,8 +686,8 @@ filetype *filetypes_get_from_filename(gint idx)
|
||||||
{
|
{
|
||||||
GPatternSpec *pattern;
|
GPatternSpec *pattern;
|
||||||
filetype *ft;
|
filetype *ft;
|
||||||
gchar *filename;
|
const gchar *utf8_filename;
|
||||||
gchar *base_filename, *utf8_filename;
|
gchar *base_filename;
|
||||||
gint i, j;
|
gint i, j;
|
||||||
|
|
||||||
if (! DOC_IDX_VALID(idx))
|
if (! DOC_IDX_VALID(idx))
|
||||||
|
@ -700,18 +700,10 @@ filetype *filetypes_get_from_filename(gint idx)
|
||||||
if (doc_list[idx].file_name == NULL)
|
if (doc_list[idx].file_name == NULL)
|
||||||
return filetypes[GEANY_FILETYPES_ALL];
|
return filetypes[GEANY_FILETYPES_ALL];
|
||||||
else
|
else
|
||||||
filename = doc_list[idx].file_name;
|
utf8_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];
|
|
||||||
}
|
|
||||||
|
|
||||||
// to match against the basename of the file(because of Makefile*)
|
// to match against the basename of the file(because of Makefile*)
|
||||||
base_filename = g_path_get_basename(utf8_filename);
|
base_filename = g_path_get_basename(utf8_filename);
|
||||||
g_free(utf8_filename);
|
|
||||||
|
|
||||||
for(i = 0; i < GEANY_MAX_FILE_TYPES; i++)
|
for(i = 0; i < GEANY_MAX_FILE_TYPES; i++)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue