font charset is iso8859-1, not iso-8859-1.

Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
	font charset is iso8859-1, not iso-8859-1.

diff --git a/ChangeLog b/ChangeLog
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a5ca6f89b71f9ede7f648860bcf7f0661aa9608e..0937812cc86805386baffb392cd664eee5044216 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jul  3 17:54:49 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): 
+       font charset is iso8859-1, not iso-8859-1.
+
 Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):

diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c
index cf65216542866cb7604eb70e8c59d0afdc74af36..2d2f2c245930dfde47ead139bc263ffb96e2abfa 100644 (file)
--- a/gdk/x11/gdkfont-x11.c
+++ b/gdk/x11/gdkfont-x11.c
@@ -141,6 +141,7 @@ gdk_font_charset_for_locale ()
 {
   static char *charset_map[][2] = {
     { "ANSI_X3.4-1968", "iso8859-1" },
+    { "US-ASCII",   "iso8859-1" },
     { "ISO-8859-1", "iso8859-1" },
     { "ISO-8859-2", "iso8859-2" },
     { "ISO-8859-3", "iso8859-3" },
@@ -150,7 +151,7 @@ gdk_font_charset_for_locale ()
     { "ISO-8859-7", "iso8859-7" },
     { "ISO-8859-8", "iso8859-8" },
     { "ISO-8859-9", "iso8859-9" },
-    { "UTF-8", "iso8859-1" }
+    { "UTF-8",      "iso8859-1" }
   };
 
   char *codeset;
@@ -169,7 +170,7 @@ gdk_font_charset_for_locale ()
   if (result)
     return g_strdup (result);
   else
-    return g_strdup ("iso-8859-1");
+    return g_strdup ("iso8859-1");
 };
 
 /**