[maemo-commits] [maemo-commits] r14797 - in projects/haf/trunk/hildon-input-method-framework: . src

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-11-19 13:40:02 +0200 (Mon, 19 Nov 2007)
New Revision: 14797

Modified:
   projects/haf/trunk/hildon-input-method-framework/ChangeLog
   projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c
Log:
2007-11-19  Tomas Junnonen  <tomas.junnonen at nokia.com>

        * src/hildon-im-context.c:
        - Pressing shift no longer resets the dead key state, which
          makes shift + dead keys commutative. Fixes NB#76248.


Modified: projects/haf/trunk/hildon-input-method-framework/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-11-19 11:13:45 UTC (rev 14796)
+++ projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-11-19 11:40:02 UTC (rev 14797)
@@ -1,3 +1,9 @@
+2007-11-19  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-context.c:
+	- Pressing shift no longer resets the dead key state, which
+	  makes shift + dead keys commutative. Fixes NB#76248.
+
 2007-10-24  Mohammad Anwari  <mohammad.anwari at nokia.com> 
 
 	* Version 1:1.99.23-1

Modified: projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c
===================================================================
--- projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c	2007-11-19 11:13:45 UTC (rev 14796)
+++ projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c	2007-11-19 11:40:02 UTC (rev 14797)
@@ -1667,7 +1667,8 @@
                                      event->hardware_keycode);
 
     /* Non-printable characters invalidate any previous dead keys */
-    self->combining_char = 0;
+    if (event->keyval != GDK_Shift_L && event->keyval != GDK_Shift_R)
+      self->combining_char = 0;
   }
 
   if (event->keyval == GDK_BackSpace)