From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri, 28 May 2010 07:24:18 +0000 (+0200)
Subject: log-window: start the search when the entry is activated (#619863)
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d754e98ad2c3a5deefc47e1b3eeedbd982360cf4

log-window: start the search when the entry is activated (#619863)
---

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 3345f5b1..ac889fc9 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -99,6 +99,8 @@ static void     log_window_find_populate                   (EmpathyLogWindow *wi
 static void     log_window_find_setup                      (EmpathyLogWindow *window);
 static void     log_window_button_find_clicked_cb          (GtkWidget        *widget,
 							    EmpathyLogWindow *window);
+static void     log_window_entry_find_activate_cb          (GtkWidget        *widget,
+							    EmpathyLogWindow *window);
 static void     log_window_button_next_clicked_cb          (GtkWidget        *widget,
 							    EmpathyLogWindow *window);
 static void     log_window_button_previous_clicked_cb      (GtkWidget        *widget,
@@ -241,6 +243,7 @@ empathy_log_window_show (TpAccount  *account,
 	empathy_builder_connect (gui, window,
 			      "log_window", "destroy", log_window_destroy_cb,
 			      "entry_find", "changed", log_window_entry_find_changed_cb,
+			      "entry_find", "activate", log_window_entry_find_activate_cb,
 			      "button_previous", "clicked", log_window_button_previous_clicked_cb,
 			      "button_next", "clicked", log_window_button_next_clicked_cb,
 			      "button_find", "clicked", log_window_button_find_clicked_cb,
@@ -738,8 +741,7 @@ log_window_find_setup (EmpathyLogWindow *window)
 }
 
 static void
-log_window_button_find_clicked_cb (GtkWidget       *widget,
-				   EmpathyLogWindow *window)
+start_find_search (EmpathyLogWindow *window)
 {
 	const gchar *str;
 
@@ -756,6 +758,20 @@ log_window_button_find_clicked_cb (GtkWidget       *widget,
 	log_window_find_populate (window, str);
 }
 
+static void
+log_window_button_find_clicked_cb (GtkWidget       *widget,
+				   EmpathyLogWindow *window)
+{
+	start_find_search (window);
+}
+
+static void
+log_window_entry_find_activate_cb (GtkWidget *entry,
+				   EmpathyLogWindow *self)
+{
+	start_find_search (self);
+}
+
 static void
 log_window_button_next_clicked_cb (GtkWidget       *widget,
 				   EmpathyLogWindow *window)