Revision: 1455 http://svn.sourceforge.net/geany/?rev=1455&view=rev Author: ntrel Date: 2007-04-16 04:10:22 -0700 (Mon, 16 Apr 2007)
Log Message: ----------- Remove wrong UTF-8 conversion in filetypes_get_from_filename().
Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-15 19:25:22 UTC (rev 1454) +++ trunk/ChangeLog 2007-04-16 11:10:22 UTC (rev 1455) @@ -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,
Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-04-15 19:25:22 UTC (rev 1454) +++ trunk/src/filetypes.c 2007-04-16 11:10:22 UTC (rev 1455) @@ -686,8 +686,8 @@ { 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 @@ if (doc_list[idx].file_name == NULL) return filetypes[GEANY_FILETYPES_ALL]; 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*) base_filename = g_path_get_basename(utf8_filename); - g_free(utf8_filename);
for(i = 0; i < GEANY_MAX_FILE_TYPES; i++) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.