when calculating the length of the expanded path, add the length of the

2004-02-01  Michael Natterer  <mitch@gimp.org>

	* app/config/gimpconfig-path.c (gimp_config_path_expand_only):
	when calculating the length of the expanded path, add the length
	of the UTF-8 converted substitution, not its length in filesystem
	encoding. Finally enables GIMP2_DIRECTORY containing non-ascii
	chars (at least on linux). Should fix bug #130118.
This commit is contained in:
Michael Natterer 2004-02-01 22:55:30 +00:00 committed by Michael Natterer
parent 82276adaa4
commit 28f95f9caa
3 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2004-02-01 Michael Natterer <mitch@gimp.org>
* app/config/gimpconfig-path.c (gimp_config_path_expand_only):
when calculating the length of the expanded path, add the length
of the UTF-8 converted substitution, not its length in filesystem
encoding. Finally enables GIMP2_DIRECTORY containing non-ascii
chars (at least on linux). Should fix bug #130118.
2004-02-01 Michael Natterer <mitch@gimp.org>
Disallow to rename the layer mask. Instead, always name the mask

View File

@ -161,9 +161,10 @@ gimp_config_path_expand_only (const gchar *path,
substs[2*n_substs] = token;
substs[2*n_substs + 1] = (gchar *) gimp_filename_to_utf8 (s);
n_substs++;
length += strlen (s);
length += strlen (substs[2*n_substs + 1]);
n_substs++;
}
else
{

View File

@ -161,9 +161,10 @@ gimp_config_path_expand_only (const gchar *path,
substs[2*n_substs] = token;
substs[2*n_substs + 1] = (gchar *) gimp_filename_to_utf8 (s);
n_substs++;
length += strlen (s);
length += strlen (substs[2*n_substs + 1]);
n_substs++;
}
else
{