Commit 7d368302 authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

make a copy of dgettext() results from full_path in all cases, since it

2003-08-31  Manish Singh  <yosh@gimp.org>

        * app/widgets/gimpitemfactory.c (gimp_item_factory_translate_func):
        make a copy of dgettext() results from full_path in all cases, since
        it might return our original string. Fixes #121083.
parent bd5bbf7a
2003-08-31 Manish Singh <yosh@gimp.org>
* app/widgets/gimpitemfactory.c (gimp_item_factory_translate_func):
make a copy of dgettext() results from full_path in all cases, since
it might return our original string. Fixes #121083.
2003-08-31 Michael Natterer <mitch@gimp.org> 2003-08-31 Michael Natterer <mitch@gimp.org>
Removed libgck from the public libgimp API: Removed libgck from the public libgimp API:
...@@ -205,7 +211,8 @@ ...@@ -205,7 +211,8 @@
* app/core/gimpimage-convert.c (gimp_image_convert): free the * app/core/gimpimage-convert.c (gimp_image_convert): free the
colormap and set colormap size to 0 after converting from indexed. colormap and set colormap size to 0 after converting from indexed.
Should make gimp_image_get_cmap() behave as advertized again. Should make gimp_image_get_cmap() behave as advertised again.
Fixes #121033.
* tools/pdbgen/pdb/image.pdb: use gimp_image_get_colormap_size() * tools/pdbgen/pdb/image.pdb: use gimp_image_get_colormap_size()
instead of accessing gimage->num_cols directly. instead of accessing gimage->num_cols directly.
...@@ -1013,9 +1013,6 @@ gimp_item_factory_translate_func (const gchar *path, ...@@ -1013,9 +1013,6 @@ gimp_item_factory_translate_func (const gchar *path,
complete = g_strconcat (item_factory->path, complete, NULL); complete = g_strconcat (item_factory->path, complete, NULL);
translation = g_strdup (dgettext (domain, complete)); translation = g_strdup (dgettext (domain, complete));
gimp_factory->translation_trash =
g_list_prepend (gimp_factory->translation_trash, translation);
while (*complete && *translation && strcmp (complete, full_path)) while (*complete && *translation && strcmp (complete, full_path))
{ {
p = strrchr (complete, '/'); p = strrchr (complete, '/');
...@@ -1034,9 +1031,12 @@ gimp_item_factory_translate_func (const gchar *path, ...@@ -1034,9 +1031,12 @@ gimp_item_factory_translate_func (const gchar *path,
} }
else else
{ {
translation = dgettext (domain, full_path); translation = g_strdup (dgettext (domain, full_path));
} }
gimp_factory->translation_trash =
g_list_prepend (gimp_factory->translation_trash, translation);
if (strncmp (item_factory->path, translation, if (strncmp (item_factory->path, translation,
strlen (item_factory->path)) == 0) strlen (item_factory->path)) == 0)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment