Don't call g_strerror() here, since it can lead to infinite recursion.

2004-04-23  Matthias Clasen  <mclasen@redhat.com>

	* glib/gconvert.c (open_converter): Don't call g_strerror() here,
	since it can lead to infinite recursion.  (#139133, Piotr Klaban)

diff --git a/ChangeLog b/ChangeLog
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1075765c2ee164a1c38433a4eb9e9699f2a26c34..9d2281e619b37b9a2ca6666da1ab3f12476544bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-04-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gconvert.c (open_converter): Don't call g_strerror() here, 
+       since it can lead to infinite recursion.  (#139133, Piotr Klaban)
+
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
        * tests/testglib.c (main): Trivial warning fix.  (#140345)

diff --git a/glib/gconvert.c b/glib/gconvert.c
index f504c6fe6d283a21d58b62be1471ddc6629522ff..3a17a2696749fca5ff16976ddc689ee493a98208 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -403,8 +403,8 @@ open_converter (const gchar *to_codeset,
                 from_codeset, to_codeset);
   else
     g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
-                _("Could not open converter from '%s' to '%s': %s"),
-                from_codeset, to_codeset, g_strerror (errno));
+                _("Could not open converter from '%s' to '%s'"),
+                from_codeset, to_codeset);
   
   return cd;
 }