Remove manual UTF-8 -> Latin1 conversion for stuff fed to g_print.

	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
	stuff fed to g_print.

8 files changed, 39 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 09fdefeb5..6c0ddfc52 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-04-11  Matthias Clasen  <maclas@gmx.de>
+
+	* tests/patterntest.c: Remove manual UTF-8 -> Latin1 conversion for
+	stuff fed to g_print.
+
 2002-04-08  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* tests/gio-test.c, tests/markup-test.c: Use gsize instead of
diff --git a/tests/patterntest.c b/tests/patterntest.c
index 81c49b905..2bb77bd45 100644
--- a/tests/patterntest.c
+++ b/tests/patterntest.c
@@ -68,9 +68,10 @@ match_type_name (GMatchType match_type)
     }
 }
 
-/* this leakes memory, but we don't care */
-
-#define utf8(str) g_convert (str, -1, "Latin1", "UTF-8", NULL, NULL, NULL)
+/* This leakes memory, but we don't care. The utf8 macro used to convert utf8 
+   back to Latin1 for feeding it to g_print. As of 2.0.1, g_print expects utf8,
+   so this is no longer necessary */
+#define utf8(str) str
 #define latin1(str) g_convert (str, -1, "UTF-8", "Latin1", NULL, NULL, NULL)
 
 static gboolean