-LRN: start search on enter

2 files changed, 23 insertions, 0 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 4425dede..39337632 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -1222,6 +1222,7 @@
                 <property name="secondary_icon_activatable">False</property>
                 <property name="primary_icon_sensitive">True</property>
                 <property name="secondary_icon_sensitive">True</property>
+                <signal name="key-press-event" handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">True</property>
diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index f11647d9..27ca9eee 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -25,6 +25,7 @@
  */
 #include "gnunet-fs-gtk-common.h"
 #include "gnunet-fs-gtk-event_handler.h"
+#include <gdk/gdkkeysyms.h>
 
 /**
  * Should gnunet-fs-gtk start in tray mode?
@@ -537,6 +538,27 @@ main_window_search_button_clicked_cb (GtkButton *button, gpointer user_data)
   GNUNET_FS_uri_destroy (uri);
 }
 
+#ifndef GDK_KEY_Return
+#define GDK_KEY_Return GDK_Return
+#endif
+
+gboolean
+main_window_search_entry_key_press_event_cb (GtkWidget *widget,
+    GdkEventKey *event, gpointer user_data)
+{
+  GtkBuilder *builder;
+  builder = GTK_BUILDER (user_data);
+
+  if (event->keyval == GDK_KEY_Return)
+  {
+    GtkWidget *find = GTK_WIDGET (gtk_builder_get_object (builder,
+        "main_window_search_button"));
+    main_window_search_button_clicked_cb (GTK_BUTTON (find), user_data);
+    return TRUE;
+  }
+  return FALSE;
+}
+
 /**
  * Add pseudonym data to tree store
  *