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

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2008-02-06 13:45:12 +0200 (Wed, 06 Feb 2008)
New Revision: 15139

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

        * src/hildon-im-ui.c: Added missing keyboard mode override from
          stylus-as-finger detection change.



Modified: projects/haf/trunk/hildon-input-method/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method/ChangeLog	2008-02-05 14:10:40 UTC (rev 15138)
+++ projects/haf/trunk/hildon-input-method/ChangeLog	2008-02-06 11:45:12 UTC (rev 15139)
@@ -1,3 +1,8 @@
+2008-02-06  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-ui.c: Added missing keyboard mode override from
+	  stylus-as-finger detection change.
+
 2008-02-05  Mohammad Anwari  <Mohammad.Anwari at nokia.com>
 
 	* src/hildon-im-ui.c: Remove control menu from the screen when the

Modified: projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c
===================================================================
--- projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-02-05 14:10:40 UTC (rev 15138)
+++ projects/haf/trunk/hildon-input-method/src/hildon-im-ui.c	2008-02-06 11:45:12 UTC (rev 15139)
@@ -1639,6 +1639,12 @@
       self->priv->trigger = HILDON_IM_TRIGGER_STYLUS;
     }
 
+    /* When the keyboard is available, non-keyboard plugins are disabled */
+    if (self->priv->keyboard_available == TRUE)
+    {
+      self->priv->trigger = HILDON_IM_TRIGGER_KEYBOARD;
+    }
+
     hildon_im_ui_show(self);
   }
 }