luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow UTF-8 in file:// parse names.

Browse Source 
2008-01-22  Alexander Larsson  <alexl@redhat.com>

        * glocalfile.c:
	Allow UTF-8 in file:// parse names.
	
        * tests/Makefile.am:
        * tests/data-input-stream.c:
        * tests/data-output-stream.c:
        * tests/g-file-info.c:
        * tests/g-file.c:
	Added a bunch of tests from Tomas Bzatek


svn path=/trunk/; revision=6351
This commit is contained in:
Alexander Larsson
2008-01-22 09:13:28 +00:00
committed by Alexander Larsson
parent 211c72e12b
commit b784923e9c
7 changed files with 1318 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gio/glocalfile.c
View File

@@ -348,7 +348,7 @@ name_is_valid_for_display (const char *string,
gboolean is_valid_utf8)
{
char c;
if (!is_valid_utf8 &&
!g_utf8_validate (string, -1, NULL))
return FALSE;
@@ -372,7 +372,8 @@ g_local_file_get_parse_name (GFile *file)
char *roundtripped_filename;
gboolean free_utf8_filename;
gboolean is_valid_utf8;
char *escaped_path;
filename = G_LOCAL_FILE (file)->filename;
if (get_filename_charset (&charset))
{
@@ -402,7 +403,6 @@ g_local_file_get_parse_name (GFile *file)
}
}
if (utf8_filename != NULL &&
name_is_valid_for_display (utf8_filename, is_valid_utf8))
{
@@ -413,7 +413,16 @@ g_local_file_get_parse_name (GFile *file)
}
else
{
parse_name = g_filename_to_uri (filename, NULL, NULL);
escaped_path = g_uri_escape_string (filename,
G_URI_RESERVED_CHARS_ALLOWED_IN_PATH_ELEMENT "/",
TRUE);
parse_name = g_strconcat ("file://",
(*escaped_path != '/') ? "/" : "",
escaped_path,
NULL);
g_free (escaped_path);
if (free_utf8_filename)
g_free (utf8_filename);
}