Use encoding names which may work better on Solaris. (#340434, Alessandro

2006-05-08  Matthias Clasen  <mclasen@redhat.com>

	* tests/convert-test.c (test_one_half): Use encoding names which
	may work better on Solaris.  (#340434, Alessandro Vesely)

diff --git a/ChangeLog b/ChangeLog
index 3f89f43..96e71b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/convert-test.c (test_one_half): Use encoding names which 
+       may work better on Solaris.  (#340434, Alessandro Vesely)
+
        * tests/keyfile-test.c (test_number): Add some tests for
        invalid floating point numbers.
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3f89f43..96e71b2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2006-05-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/convert-test.c (test_one_half): Use encoding names which 
+       may work better on Solaris.  (#340434, Alessandro Vesely)
+
        * tests/keyfile-test.c (test_number): Add some tests for
        invalid floating point numbers.
 

diff --git a/tests/convert-test.c b/tests/convert-test.c
index a24a9e2..3ea3a66 100644 (file)
--- a/tests/convert-test.c
+++ b/tests/convert-test.c
@@ -63,7 +63,7 @@ test_one_half (void)
   GError *error = NULL;  
 
   out = g_convert (in, -1, 
-                  "ISO8859-1", "UTF-8",
+                  "ISO-8859-1", "UTF-8",
                   &bytes_read, &bytes_written,
                   &error);
 
@@ -74,7 +74,7 @@ test_one_half (void)
   g_free (out);
 
   out = g_convert (in, -1, 
-                  "ISO8859-15", "UTF-8",
+                  "ISO-8859-15", "UTF-8",
                   &bytes_read, &bytes_written,
                   &error);