luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 09:16:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't call g_get_language_names() per-key. (#500638, Michael Meeks)

Browse Source 
2007-12-03  Matthias Clasen  <mclasen@redhat.com>

        * glib/gkeyfile.c: Don't call g_get_language_names() per-key.
        (#500638, Michael Meeks)


svn path=/trunk/; revision=6023
This commit is contained in:
Matthias Clasen 2007-12-03 18:56:33 +00:00 committed by Matthias Clasen
parent 458f3eca76
commit 2efc55c68e
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-03 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c: Don't call g_get_language_names() per-key.
(#500638, Michael Meeks)
2007-12-03 Marco Barisione <marco@barisione.org>
* glib/gregex.c:

23
glib/gkeyfile.c
View File

@ -81,6 +81,8 @@ struct _GKeyFile
gchar list_separator;
GKeyFileFlags flags;
gchar **locales;
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
@ -206,6 +208,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->approximate_size = 0;
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
}
static void
@ -213,8 +216,17 @@ g_key_file_clear (GKeyFile *key_file)
{
GList *tmp, *group_node;
if (key_file->locales)
{
g_strfreev (key_file->locales);
key_file->locales = NULL;
}
if (key_file->parse_buffer)
g_string_free (key_file->parse_buffer, TRUE);
{
g_string_free (key_file->parse_buffer, TRUE);
key_file->parse_buffer = NULL;
}
tmp = key_file->groups;
while (tmp != NULL)
@ -698,17 +710,14 @@ static gboolean
g_key_file_locale_is_interesting (GKeyFile *key_file,
const gchar *locale)
{
const gchar * const * current_locales;
gsize i;
if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS)
return TRUE;
current_locales = g_get_language_names ();
for (i = 0; current_locales[i] != NULL; i++)
for (i = 0; key_file->locales[i] != NULL; i++)
{
if (g_ascii_strcasecmp (current_locales[i], locale) == 0)
if (g_ascii_strcasecmp (key_file->locales[i], locale) == 0)
return TRUE;
}
@ -2999,7 +3008,7 @@ g_key_file_add_group (GKeyFile *key_file,
if (key_file->start_group == NULL)
key_file->start_group = group;
g_hash_table_insert (key_file->group_hash, group->name, group);
g_hash_table_insert (key_file->group_hash, (gpointer)group->name, group);
}
static void