Accept '@' in locale names.

2006-12-18 Matthias Clasen <mclasen@redhat.com> * glib/gkeyfile.c: Accept '@' in locale names.

Accept '@' in locale names.
2006-12-18 Matthias Clasen <mclasen@redhat.com> * glib/gkeyfile.c: Accept '@' in locale names.
52ef9438 · Matthias Clasen · Matthias Clasen · 6b52690b · 52ef9438 · 52ef9438
Commit 52ef9438 authored Dec 18, 2006 by Matthias Clasen Committed by Matthias Clasen Dec 18, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ChangeLog ChangeLog +2 -0

glib/gkeyfile.c glib/gkeyfile.c +1 -1

tests/keyfile-test.c tests/keyfile-test.c +3 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 2006-12-18  Matthias Clasen  <mclasen@redhat.com>

+	* glib/gkeyfile.c: Accept '@' in locale names.
+
 	* glib/gkeyfile.c: Tighten up the check for allowed
 	key and group names.  (#343191, Tommi Komulainen)


--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -3240,7 +3240,7 @@ g_key_file_is_key_name (const gchar *name)
  if (*q == '[')
    {
      q++;
-      while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || *q == '-' || *q == '_' || *q == '.'))
+      while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || *q == '-' || *q == '_' || *q == '.' || *q == '@'))
        q = g_utf8_next_char (q);

      if (*q != ']')

--- a/tests/keyfile-test.c
+++ b/tests/keyfile-test.c
@@ -755,7 +755,8 @@ test_locale_string (void)
    "key1[de_DE]=v1-de_DE\n"
    "key1[de_DE.UTF8]=v1-de_DE.UTF8\n"
    "key1[fr]=v1-fr\n"
-    "key1[en] =v1-en\n";
+    "key1[en] =v1-en\n"
+    "key1[sr@Latn]=v1-sr\n";
  
  keyfile = load_data (data, G_KEY_FILE_KEEP_TRANSLATIONS);

@@ -766,6 +767,7 @@ test_locale_string (void)
  check_locale_string_value (keyfile, "valid", "key1", "fr", "v1-fr");
  check_locale_string_value (keyfile, "valid", "key1", "fr_FR", "v1-fr");
  check_locale_string_value (keyfile, "valid", "key1", "en", "v1-en");
+  check_locale_string_value (keyfile, "valid", "key1", "sr@Latn", "v1-sr");
  
  g_key_file_free (keyfile);