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

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-09-10 16:21:53 +0300 (Mon, 10 Sep 2007)
New Revision: 13709

Modified:
   projects/haf/trunk/hildon-input-method-framework/ChangeLog
   projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c
Log:
- Entries with activate signal handlers must not move focus on enter


Modified: projects/haf/trunk/hildon-input-method-framework/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-09-10 13:19:23 UTC (rev 13708)
+++ projects/haf/trunk/hildon-input-method-framework/ChangeLog	2007-09-10 13:21:53 UTC (rev 13709)
@@ -1,6 +1,8 @@
 2007-09-10  Tomas Junnonen  <tomas.junnonen at nokia.com>
 
-	* src/hildon-im-context.c: Restrict override of tab focus target to GtkEntries
+	* src/hildon-im-context.c:
+	- Restrict override of tab focus target to GtkEntries
+	- Entries with activate signal handlers must not move focus on enter
 
 2007-09-10  Mohammad Anwari  <mohammad.anwari at nokia.com> 
 

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-10 13:19:23 UTC (rev 13708)
+++ projects/haf/trunk/hildon-input-method-framework/src/hildon-im-context.c	2007-09-10 13:21:53 UTC (rev 13709)
@@ -1429,6 +1429,12 @@
       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) &&