From 53268d5516083c47607dbd3acbbd6bafd6d15747 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 2 Sep 2009 15:21:35 -0400
Subject: Introduce an EShellView::execute-search signal.

This addresses bug #593896 but is also a cleaner design than before.
It introduces an EShellView::execute-search signal and renames the
"search-execute" action to "search-quick" to clarify that it's only
meant for the "quick" search bar in the main window.

Shell view subclasses should implement the execute_search() method to
actually execute a search.

e_shell_view_execute_search() emits the new signal.
---
 doc/reference/shell/eshell-sections.txt     | 1 +
 doc/reference/shell/tmpl/e-shell-view.sgml  | 8 ++++++++
 doc/reference/shell/tmpl/eshell-unused.sgml | 7 +++++++
 doc/reference/shell/tmpl/shell-actions.sgml | 8 --------
 4 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'doc')

diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index 8bfb57b5f3..3404319f6b 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -237,6 +237,7 @@ e_shell_view_get_shell_taskbar
 e_shell_view_get_shell_window
 e_shell_view_get_state_key_file
 e_shell_view_set_state_dirty
+e_shell_view_execute_search
 e_shell_view_update_actions
 e_shell_view_show_popup_menu
 e_shell_view_new_view_instance
diff --git a/doc/reference/shell/tmpl/e-shell-view.sgml b/doc/reference/shell/tmpl/e-shell-view.sgml
index 408e869528..03fe57177a 100644
--- a/doc/reference/shell/tmpl/e-shell-view.sgml
+++ b/doc/reference/shell/tmpl/e-shell-view.sgml
@@ -23,6 +23,13 @@ EShellView
 </para>
 
 
+<!-- ##### SIGNAL EShellView::execute-search ##### -->
+<para>
+
+</para>
+
+@eshellview: the object which received the signal.
+
 <!-- ##### SIGNAL EShellView::toggled ##### -->
 <para>
 
@@ -100,6 +107,7 @@ EShellView
 @new_shell_sidebar: 
 @new_shell_taskbar: 
 @toggled: 
+@execute_search: 
 @update_actions: 
 
 <!-- ##### FUNCTION e_shell_view_get_name ##### -->
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 827e2a95f5..5f6b668d65 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -701,6 +701,13 @@ intelligent
 
 @window: 
 
+<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_EXECUTE ##### -->
+<para>
+
+</para>
+
+@window: 
+
 <!-- ##### MACRO E_SUMMARY_STORAGE_NAME ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/shell-actions.sgml b/doc/reference/shell/tmpl/shell-actions.sgml
index 60001d61bb..d0fa5d655f 100644
--- a/doc/reference/shell/tmpl/shell-actions.sgml
+++ b/doc/reference/shell/tmpl/shell-actions.sgml
@@ -153,14 +153,6 @@ Shell Actions
 @window: 
 
 
-<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_EXECUTE ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
 <!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEARCH_OPTIONS ##### -->
 <para>
 
-- 
cgit