aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/folder-browser.c6
2 files changed, 12 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c8e7c614f6..1693d29cce 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2002-02-24 Chris Toshok <toshok@ximian.com>
+
+ * folder-browser.c (folder_browser_search_do_search): rename
+ folder_browser_search_query_changed to this.
+ (folder_browser_gui_init): hook both query_changed and
+ search_activated up to folder_browser_search_do_search, preserving
+ current behavior.
+
2002-02-22 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (on_message_list_built): Removed, this wasn't
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index ce18258952..daab5eed88 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1129,7 +1129,7 @@ folder_browser_config_search (EFilterBar *efb, FilterRule *rule, int id, const c
}
static void
-folder_browser_search_query_changed (ESearchBar *esb, FolderBrowser *fb)
+folder_browser_search_do_search (ESearchBar *esb, FolderBrowser *fb)
{
char *search_word;
@@ -1912,9 +1912,11 @@ folder_browser_gui_init (FolderBrowser *fb)
gtk_widget_show (GTK_WIDGET (fb->search));
gtk_signal_connect (GTK_OBJECT (fb->search), "query_changed",
- GTK_SIGNAL_FUNC (folder_browser_search_query_changed), fb);
+ GTK_SIGNAL_FUNC (folder_browser_search_do_search), fb);
gtk_signal_connect (GTK_OBJECT (fb->search), "menu_activated",
GTK_SIGNAL_FUNC (folder_browser_search_menu_activated), fb);
+ gtk_signal_connect (GTK_OBJECT (fb->search), "search_activated",
+ GTK_SIGNAL_FUNC (folder_browser_search_do_search), fb);
gtk_table_attach (GTK_TABLE (fb), GTK_WIDGET (fb->search),