Fix a typo: to_codeset => from_codeset. (#58195, #55152)

	* glib/gconvert.c (g_iconv_open):
	Fix a typo: to_codeset => from_codeset.
	(#58195, #55152)

diff --git a/ChangeLog b/ChangeLog
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2a00a45..6e7c0c2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2001-10-17  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * glib/gconvert.c (g_iconv_open):
+       Fix a typo: to_codeset => from_codeset.
+       (#58195, #55152)
+
 Fri Oct 12 18:24:02 2001  Tim Janik  <timj@gtk.org>
 
        * glib/gpattern.[hc]: make struct _GPatternSpec and GMatchType

diff --git a/glib/gconvert.c b/glib/gconvert.c
index bc1c760..dfdea6c 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -111,7 +111,7 @@ g_iconv_open (const gchar  *to_codeset,
   if (!try_conversion (to_codeset, from_codeset, &cd))
     {
       const char **to_aliases = _g_charset_get_aliases (to_codeset);
-      const char **from_aliases = _g_charset_get_aliases (to_codeset);
+      const char **from_aliases = _g_charset_get_aliases (from_codeset);
 
       if (from_aliases)
        {