clear search entry when Escape key is pressed.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1743 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 29 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e89e585..d8ac085f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+2007-06-04
+
+	* src/summaryview.c: clear search entry when Escape key is pressed.
+
 2007-05-28
 
-	* src/compose.c: compose_exec_ext_editor(): win32: fixed infinite loop when
-	  pid was not obtained.
+	* src/compose.c: compose_exec_ext_editor(): win32: fixed infinite loop
+	  when pid was not obtained.
 
 2007-05-28
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 81fa72cf..8e6f4ef5 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2007-06-04
+
+	* src/summaryview.c: Escape キーが押されたら検索エントリをクリアする
+	  ようにした。
+
 2007-05-28
 
 	* src/compose.c: compose_exec_ext_editor(): win32: pid を取得でき
diff --git a/src/summaryview.c b/src/summaryview.c
index a5e1a861..6cd839f8 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -272,6 +272,10 @@ static void summary_search_entry_changed(GtkWidget		*entry,
 static void summary_search_entry_activated
 					(GtkWidget		*entry,
 					 SummaryView		*summaryview);
+static gboolean summary_search_entry_key_pressed
+					(GtkWidget		*treeview,
+					 GdkEventKey		*event,
+					 SummaryView		*summaryview);
 static void summary_search_clear_clicked(GtkWidget		*button,
 					 SummaryView		*summaryview);
 
@@ -589,6 +593,9 @@ SummaryView *summary_create(void)
 	g_signal_connect(G_OBJECT(search_entry), "activate",
 			 G_CALLBACK(summary_search_entry_activated),
 			 summaryview);
+	g_signal_connect(G_OBJECT(search_entry), "key_press_event",
+			 G_CALLBACK(summary_search_entry_key_pressed),
+			 summaryview);
 
 	search_tip = gtk_tooltips_new();
 	gtk_tooltips_set_tip(search_tip, search_entry,
@@ -5517,6 +5524,17 @@ static void summary_search_entry_activated(GtkWidget *entry,
 	summary_qsearch(summaryview);
 }
 
+static gboolean summary_search_entry_key_pressed(GtkWidget *treeview,
+						 GdkEventKey *event,
+						 SummaryView *summaryview)
+{
+	if (event && event->keyval == GDK_Escape) {
+		summary_qsearch_clear_entry(summaryview);
+		return TRUE;
+	}
+	return FALSE;
+}
+
 static void summary_search_clear_clicked(GtkWidget *button,
 					 SummaryView *summaryview)
 {