Fix incorrect return value, filter out returns of 0x7f for the delete key.

Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
        Fix incorrect return value, filter out returns of 0x7f for
        the delete key. (#74179, Kang Jeong-He)

diff --git a/ChangeLog b/ChangeLog
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2285ccf53f9f560c722baa397d44d6b64e7c184c..cdcc2c3ebffd59946ac4cd3596f1d797e977f7b3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Mar 12 10:50:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress):
+       Fix incorrect return value, filter out returns of 0x7f for
+       the delete key. (#74179, Kang Jeong-He)
+
 Mon Mar 11 23:42:11 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_model_foreach): fix totally broken

diff --git a/NEWS b/NEWS
index 36a02a361227a47438e42ec9a11f2ddb1077a575..4955bd963930bf3e120c6a7140541ad485e2202c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -126,7 +126,7 @@ Overview of Changes in GTK+ 1.3.13
   [Mark Patton]
 * gtk_widget_set_accel_path() is now publically exported.
 
-Other contributors: Darin Adler, Jeffry Baker, Damon Chaplin, Brian Cameron, 
+Other contributors: Darin Adler, Jeffrey Baker, Damon Chaplin, Brian Cameron, 
   Murray Cumming, James Henstridge, Jacob Berkman, Arnaud Charlet, Jeff Franks, 
   Jeff Garzik, Jody Goldberg, Diego Gonzalez, Melvin Hadasht, Raja Harinath, 
   Tim Janik, Mike Kestner, Mathieu Lacage, Alex Larsson, Ryan Lovett, 

diff --git a/README.in b/README.in
index ef5bc45e3d5a3457124ec676e36a1a098a95e853..5b958dfd9cc55bd3dad1950e4b356798b2cd6a79 100644 (file)
--- a/README.in
+++ b/README.in
@@ -1,4 +1,4 @@
-General Information
+General InformationaaaaaX
 ===================
 
 This is GTK+ version @GTK_VERSION@. GTK+ is a multi-platform toolkit for

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index ec7565aeefd5dfcea4c6e30b0ff15b425e746f91..a76b667de1de86dadd52c1d9b5c49cc4f1b3c7dd 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -379,9 +379,10 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
       result_utf8 = mb_to_utf8 (context_xim, buffer);
       if (result_utf8)
        {
-         if ((guchar)result_utf8[0] >= 0x20) /* Some IM have a nasty habit of converting
-                                              * control characters into strings
-                                              */
+         if ((guchar)result_utf8[0] >= 0x20 &&
+             result_utf8[0] != 0x7f) /* Some IM have a nasty habit of converting
+                                      * control characters into strings
+                                      */
            {
              g_signal_emit_by_name (context, "commit", result_utf8);
              result = TRUE;
@@ -391,7 +392,7 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
        }
     }
 
-  return FALSE;
+  return result;
 }
 
 static void