2006-09-05 Tomas Junnonen <tomas.junnonen@nokia.com>

* src/hildon-widgets/hildon-find-toolbar.c: Start search on "activate"
	entry signal instead of only KP_Enter.

diff --git a/ChangeLog b/ChangeLog
index 2400840..afbcd8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-05  Tomas Junnonen  <tomas.junnonen@nokia.com>
+
+       * src/hildon-widgets/hildon-find-toolbar.c: Start search on "activate"
+       entry signal instead of only KP_Enter. 
+
 2006-09-04  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * hildon-widgets/hildon-banner.c: Aling the stock images to 0.0

diff --git a/hildon-widgets/hildon-find-toolbar.c b/hildon-widgets/hildon-find-toolbar.c
index 6dc3fdd..e02d5f6 100644 (file)
--- a/hildon-widgets/hildon-find-toolbar.c
+++ b/hildon-widgets/hildon-find-toolbar.c
@@ -386,25 +386,15 @@ hildon_find_toolbar_emit_invalid_input(GtkEntry *entry,
     g_signal_emit_by_name(self, "invalid_input", NULL);
 }
 
-static gboolean
-hildon_find_toolbar_entry_key_press (GtkWidget *widget,
-                                    GdkEventKey *event,
+static void
+hildon_find_toolbar_entry_activate (GtkWidget *widget,
                                     gpointer user_data)
 {
   GtkWidget *find_toolbar = GTK_WIDGET(user_data);
-  
-  /* on enter we emit search and history_append signals and keep
-   * focus by returning true */
-  if (event->keyval == GDK_KP_Enter)
-    {
-      gboolean rb;  
-      g_signal_emit_by_name(find_toolbar, "search", NULL);
-      g_signal_emit_by_name(find_toolbar, "history_append", &rb, NULL);
-
-      return TRUE;
-    }
+  gboolean rb;  
 
-  return FALSE;      
+  g_signal_emit_by_name(find_toolbar, "search", NULL);
+  g_signal_emit_by_name(find_toolbar, "history_append", &rb, NULL);
 }
 
 static void
@@ -559,8 +549,8 @@ hildon_find_toolbar_init(HildonFindToolbar *self)
   gtk_widget_show_all(GTK_WIDGET(entry_combo_box_container));
   gtk_toolbar_insert (GTK_TOOLBAR(self), entry_combo_box_container, -1);
   g_signal_connect(hildon_find_toolbar_get_entry(self->priv),
-                    "key-press-event",
-                    G_CALLBACK(hildon_find_toolbar_entry_key_press), self);
+                    "activate",
+                    G_CALLBACK(hildon_find_toolbar_entry_activate), self);
 
   /* Find button */
   self->priv->find_button = gtk_tool_button_new (