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

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-09-19 14:15:28 +0300 (Wed, 19 Sep 2007)
New Revision: 13913

Modified:
   projects/haf/trunk/hildon-input-method-framework/ChangeLog
   projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c
Log:
* src/hildon-im-context.c: Exclude return from changing the focus.
  Fixes NB#69697.



Modified: projects/haf/trunk/hildon-input-method-framework/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-09-19 10:29:58 UTC (rev 13912)
+++ projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-09-19 11:15:28 UTC (rev 13913)
@@ -1,3 +1,8 @@
+2007-09-19  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* src/hildon-im-context.c: Exclude return from changing the focus.
+	  Fixes NB#69697.
+
 2007-09-12  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
 	* src/hildon-im-gtk.c: Only consider mapped and visible widgets

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-09-19 10:29:58 UTC (rev 13912)
+++ projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c	2007-09-19 11:15:28 UTC (rev 13913)
@@ -1429,24 +1429,26 @@
       event->keyval == GDK_KP_Enter ||
       event->keyval == GDK_ISO_Enter)
   {
-    if (g_signal_handler_find(self->client_gtk_widget,
-                              G_SIGNAL_MATCH_ID,
-                              g_signal_lookup("activate", GTK_TYPE_ENTRY),
-                              0, NULL, NULL, NULL))
-      return FALSE;
-
-    /* If the client widget doesn't activate, enter acts as tab */
-    if (event->type == GDK_KEY_PRESS &&
-        GTK_IS_ENTRY(self->client_gtk_widget) &&
-        !gtk_entry_get_activates_default(GTK_ENTRY(self->client_gtk_widget)))
+    /* Enter advances focus as if tab was pressed */
+    if (event->keyval == GDK_KP_Enter || event->keyval == GDK_ISO_Enter)
     {
-      hildon_im_gtk_focus_next_text_widget(self->client_gtk_widget,
-                                           GTK_DIR_TAB_FORWARD);
-      return TRUE;
-    }
+      if (g_signal_handler_find(self->client_gtk_widget,
+                                G_SIGNAL_MATCH_ID,
+                                g_signal_lookup("activate", GTK_TYPE_ENTRY),
+                                0, NULL, NULL, NULL))
+        return FALSE;
 
-    if (event->keyval == GDK_KP_Enter)
+      if (event->type == GDK_KEY_PRESS &&
+          GTK_IS_ENTRY(self->client_gtk_widget) &&
+          !gtk_entry_get_activates_default(GTK_ENTRY(self->client_gtk_widget)))
+      {
+        hildon_im_gtk_focus_next_text_widget(self->client_gtk_widget,
+                                             GTK_DIR_TAB_FORWARD);
+        return TRUE;
+      }
+
       return FALSE;
+    }
 
     hildon_im_context_send_key_event(self, event->type, event->state, event->keyval, event->hardware_keycode);
     /* Stop both press and release events so they aren't sent to the application. */