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

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-10-22 14:22:34 +0300 (Mon, 22 Oct 2007)
New Revision: 14563

Modified:
   projects/haf/trunk/hildon-input-method/ChangeLog
   projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
Log:
2007-10-22  Tomas Junnonen  <tomas.junnonen at nokia.com>

        * src/hildon-im-ui.c: Don't show the IM UI if the
          user is activating a shortcut. Fixes NB#73124.



Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2007-10-22 11:14:51 UTC (rev 14562)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2007-10-22 11:22:34 UTC (rev 14563)
@@ -1,3 +1,8 @@
+2007-10-22  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-ui.c: Don't show the IM UI if the
+	  user is activating a shortcut. Fixes NB#73124.
+
 2007-10-12  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* Version 1.99.31

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2007-10-22 11:14:51 UTC (rev 14562)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2007-10-22 11:22:34 UTC (rev 14563)
@@ -1726,7 +1726,8 @@
   {
     guint c = gdk_keyval_to_unicode(msg->keyval);
 
-    if (g_unichar_isprint(c) || msg->keyval == GDK_Multi_key)
+    if ((g_unichar_isprint(c) || msg->keyval == GDK_Multi_key) &&
+        (msg->state & GDK_CONTROL_MASK) == 0)
     {
       hildon_im_ui_show(self);
     }