Don't commit unless we got at least one hex digit. (#70619)

Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):
	Don't commit unless we got at least one hex digit. (#70619)

diff --git a/ChangeLog b/ChangeLog
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6ea346fbacecb0495a96988a89dc740c04a34756..47b6d8bde402c5663258644e2d1bf0099bb1092e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Feb 18 12:31:52 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): 
+       Don't commit unless we got at least one hex digit. (#70619)
+
 Sun Feb 17 21:30:49 2002  Owen Taylor  <otaylor@redhat.com>
 
        * Released 1.3.14

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 6c545e715c3b2ce6a4ce9ccf0ee92bf03a5d234b..3f605f9f6d8e0388661925a80e2d31c7848bf96f 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -1122,8 +1122,13 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
          (event->keyval == GDK_Control_L || event->keyval == GDK_Control_R ||
           event->keyval == GDK_Shift_L || event->keyval == GDK_Shift_R))
        {
-         gtk_im_context_simple_commit_char (context, context_simple->tentative_match);
-         context_simple->compose_buffer[0] = 0;
+         if (context_simple->tentative_match)
+           {
+             gtk_im_context_simple_commit_char (context, context_simple->tentative_match);
+             context_simple->compose_buffer[0] = 0;
+           }
+         else
+           context_simple->in_hex_sequence = 0;
 
          return TRUE;
        }