//bugs.xfree86.org/show_bug.cgi?id=534)

Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>

        * Back out locale-dependent interpretation of
        KP_Decimal, the official XFree86 interpretation
        is that KP_Decimal => . KP_Separator => ,
        always, independent of locale.
        (#105161, Frederic Crozat,
        http://bugs.xfree86.org/show_bug.cgi?id=534)

diff --git a/ChangeLog b/ChangeLog
index e069da798be325d9dea4a80402b871875c40eb41..fd3ed86a32d6fd2136f81dae87731a97bb067db4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * Back out locale-dependent interpretation of
+       KP_Decimal, the official XFree86 interpretation
+       is that KP_Decimal => . KP_Separator => ,
+       always, independent of locale. 
+       (#105161, Frederic Crozat, 
+       http://bugs.xfree86.org/show_bug.cgi?id=534)
+ 
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testmerge.c: Test buttons and toggle buttons as proxies.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e069da798be325d9dea4a80402b871875c40eb41..fd3ed86a32d6fd2136f81dae87731a97bb067db4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * Back out locale-dependent interpretation of
+       KP_Decimal, the official XFree86 interpretation
+       is that KP_Decimal => . KP_Separator => ,
+       always, independent of locale. 
+       (#105161, Frederic Crozat, 
+       http://bugs.xfree86.org/show_bug.cgi?id=534)
+ 
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testmerge.c: Test buttons and toggle buttons as proxies.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e069da798be325d9dea4a80402b871875c40eb41..fd3ed86a32d6fd2136f81dae87731a97bb067db4 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * Back out locale-dependent interpretation of
+       KP_Decimal, the official XFree86 interpretation
+       is that KP_Decimal => . KP_Separator => ,
+       always, independent of locale. 
+       (#105161, Frederic Crozat, 
+       http://bugs.xfree86.org/show_bug.cgi?id=534)
+ 
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testmerge.c: Test buttons and toggle buttons as proxies.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e069da798be325d9dea4a80402b871875c40eb41..fd3ed86a32d6fd2136f81dae87731a97bb067db4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * Back out locale-dependent interpretation of
+       KP_Decimal, the official XFree86 interpretation
+       is that KP_Decimal => . KP_Separator => ,
+       always, independent of locale. 
+       (#105161, Frederic Crozat, 
+       http://bugs.xfree86.org/show_bug.cgi?id=534)
+ 
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testmerge.c: Test buttons and toggle buttons as proxies.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e069da798be325d9dea4a80402b871875c40eb41..fd3ed86a32d6fd2136f81dae87731a97bb067db4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Sep  5 14:15:10 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * Back out locale-dependent interpretation of
+       KP_Decimal, the official XFree86 interpretation
+       is that KP_Decimal => . KP_Separator => ,
+       always, independent of locale. 
+       (#105161, Frederic Crozat, 
+       http://bugs.xfree86.org/show_bug.cgi?id=534)
+ 
 2003-09-04  Matthias Clasen  <maclas@gmx.de>
 
        * tests/testmerge.c: Test buttons and toggle buttons as proxies.

diff --git a/gdk/gdkkeyuni.c b/gdk/gdkkeyuni.c
index fb5292cca11fe133939382f7ed169a311a950b64..c7c7822b38ce752cadee3518daaa72611bf43598 100644 (file)
--- a/gdk/gdkkeyuni.c
+++ b/gdk/gdkkeyuni.c
@@ -1,7 +1,4 @@
-#include <locale.h>
-
 #include "gdk.h"
-#include "gdkkeysyms.h"
 
 /* Thanks to Markus G. Kuhn <mkuhn@acm.org> for the ksysym<->Unicode
  * mapping functions, from the xterm sources.
@@ -826,25 +823,6 @@ static struct {
   /* End numeric keypad */
 };
 
-static gunichar
-get_decimal_char (void)
-{
-  struct lconv *locale_data;
-  gunichar result = '.';
-  gchar *utf8;
-
-  locale_data = localeconv ();
-  utf8 = g_locale_to_utf8 (locale_data->decimal_point, -1, NULL, NULL, NULL);
-  if (utf8)
-    {
-      if (g_utf8_strlen (utf8, -1) == 1)
-       result = g_utf8_get_char (utf8);
-      g_free (utf8);
-    }
-
-  return result;
-}
-
 /**
  * gdk_keyval_to_unicode:
  * @keyval: a GDK key symbol 
@@ -872,11 +850,6 @@ gdk_keyval_to_unicode (guint keyval)
   if ((keyval & 0xff000000) == 0x01000000)
     return keyval & 0x00ffffff;
 
-  /* Translation of KP_Decimal depends on locale.
-   */
-  if (keyval == GDK_KP_Decimal)
-    return get_decimal_char ();
-
   /* binary search in table */
   while (max >= min) {
     mid = (min + max) / 2;