[gnome-desktop/wip/hadess/languages-fixes: 3/5] gnome-languages: Don't duplicate static strings in hash table
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop/wip/hadess/languages-fixes: 3/5] gnome-languages: Don't duplicate static strings in hash table
- Date: Mon, 15 Jul 2019 11:49:18 +0000 (UTC)
commit 74efd92444b5969f1201596556360129736c804c
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jul 15 13:42:44 2019 +0200
gnome-languages: Don't duplicate static strings in hash table
We copy them out of the hash table before destroying it.
libgnome-desktop/gnome-languages.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libgnome-desktop/gnome-languages.c b/libgnome-desktop/gnome-languages.c
index 57552c5d..c4fc9be8 100644
--- a/libgnome-desktop/gnome-languages.c
+++ b/libgnome-desktop/gnome-languages.c
@@ -1369,7 +1369,7 @@ gnome_get_translated_modifier (const char *modifier,
old_locale = uselocale (loc);
}
- modifiers_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ modifiers_map = g_hash_table_new (g_str_hash, g_str_equal);
/* Modifiers as listed in glibc's SUPPORTED file:
* https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED;hb=HEAD
@@ -1378,26 +1378,26 @@ gnome_get_translated_modifier (const char *modifier,
/* TRANSLATORS: Used to distinguish the labels representing the gez_ER
and gez_ET locales from gez_ER@abegede respective gez_ET@abegede. The
difference is related to collation. */
- g_hash_table_insert (modifiers_map, g_strdup ("abegede"), g_strdup (_("Abegede")));
+ g_hash_table_insert (modifiers_map, "abegede", _("Abegede"));
/* TRANSLATORS: Used to distinguish Cyrillic from Latin written language variants. */
- g_hash_table_insert (modifiers_map, g_strdup ("cyrillic"), g_strdup (_("Cyrillic")));
+ g_hash_table_insert (modifiers_map, "cyrillic", _("Cyrillic"));
/* TRANSLATORS: Also known as "Nagari", a written variant for many languages
* of the Indian subcontinent. See:
* https://en.wikipedia.org/wiki/Devanagari */
- g_hash_table_insert (modifiers_map, g_strdup ("devanagari"), g_strdup (_("Devanagari")));
+ g_hash_table_insert (modifiers_map, "devanagari", _("Devanagari"));
/* TRANSLATORS: Used to distinguish the label representing the tt_RU
locale from tt_RU@iqtelif. It's a special alphabet for Tatar. */
- g_hash_table_insert (modifiers_map, g_strdup ("iqtelif"), g_strdup (_("IQTElif")));
+ g_hash_table_insert (modifiers_map, "iqtelif", _("IQTElif"));
/* TRANSLATORS: The alphabet/script, not the language. Used to distinguish
* Latin from Cyrillic written language variants. */
- g_hash_table_insert (modifiers_map, g_strdup ("latin"), g_strdup (_("Latin")));
+ g_hash_table_insert (modifiers_map, "latin", _("Latin"));
/* TRANSLATORS: "Saho" is a variant of the Afar language. Used to
distinguish the label representing the aa_ER locale from aa_ER@saaho. */
- g_hash_table_insert (modifiers_map, g_strdup ("saaho"), g_strdup (_("Saho")));
+ g_hash_table_insert (modifiers_map, "saaho", _("Saho"));
/* TRANSLATORS: "Valencia" is a dialect of the Catalan language spoken
in Valencia. Used to distinguish the label representing the ca_ES
locale from ca_ES@valencia. */
- g_hash_table_insert (modifiers_map, g_strdup ("valencia"), g_strdup (_("Valencia")));
+ g_hash_table_insert (modifiers_map, "valencia", _("Valencia"));
if (g_hash_table_contains (modifiers_map, modifier))
retval = g_strdup (g_hash_table_lookup (modifiers_map, modifier));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]