Un #if 0'd out (search_full): Same. (folder_browser_gui_init): Connect

2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>

	* folder-browser.c (search_full_clicked): Un #if 0'd out
	(search_full): Same.
	(folder_browser_gui_init): Connect search_full and search_activate.
	(search_set): Uncomment search_full()

	* Makefile.am: Re-add `mail-search-dialogue.h' and
	`mail-search-dialogue.c'.

svn path=/trunk/; revision=5957

3 files changed, 16 insertions, 6 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index f95efdadad..1adccb1e0f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,15 @@
 2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
 
+	* folder-browser.c (search_full_clicked): Un #if 0'd out
+	(search_full): Same.
+	(folder_browser_gui_init): Connect search_full and search_activate.
+	(search_set): Uncomment search_full()
+
+	* Makefile.am: Re-add `mail-search-dialogue.h' and
+	`mail-search-dialogue.c'.
+
+2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
+
 	* mail-format.c (mail_generate_reply): Decode recipient names so
 	that they display nicely in the To and Cc fields.
 	(write_field_to_stream): Now takes another argument
diff --git a/mail/Makefile.am b/mail/Makefile.am
index ff988594c0..0b1b6a980b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -65,6 +65,8 @@ evolution_mail_SOURCES =		\
 	mail-mlist-magic.h		\
 	mail-ops.c			\
 	mail-ops.h			\
+	mail-search-dialogue.c		\
+	mail-search-dialogue.h		\
 	mail-threads.c			\
 	mail-threads.h			\
 	mail-tools.c			\
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index f3ad51b963..46a78b6c77 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -27,7 +27,7 @@
 #include "filter/filter-option.h"
 #include "filter/filter-input.h"
 
-/* #include "mail-search-dialogue.h" */
+#include "mail-search-dialogue.h"
 
 #include "mail-local.h"
 #include "mail-config.h"
@@ -156,7 +156,6 @@ static char * search_string[] = {
 };
 #define CUSTOM_SEARCH_ID (5)
 
-#if 0
 static void
 search_full_clicked(MailSearchDialogue *msd, guint button, FolderBrowser *fb)
 {
@@ -201,7 +200,6 @@ search_full(GtkWidget *w, FolderBrowser *fb)
 	gtk_signal_connect((GtkObject *)msd, "clicked", search_full_clicked, fb);
 	gtk_widget_show((GtkWidget*)msd);
 }
-#endif
 
 static void
 search_set(FolderBrowser *fb)
@@ -215,7 +213,7 @@ search_set(FolderBrowser *fb)
 	widget = gtk_menu_get_active (GTK_MENU(GTK_OPTION_MENU(fb->search_menu)->menu));
 	index = (int)gtk_object_get_data((GtkObject *)widget, "search_option");
 	if (index == CUSTOM_SEARCH_ID) {
-		/* search_full(NULL, fb); */
+		search_full(NULL, fb);
 		return;
 	}
 	gtk_widget_set_sensitive(fb->search_entry, TRUE);
@@ -484,7 +482,7 @@ folder_browser_gui_init (FolderBrowser *fb)
 	fb->search_entry = gtk_entry_new();
 	gtk_widget_show(fb->search_entry);
 	gtk_signal_connect(GTK_OBJECT (fb->search_entry), "activate", search_activate, fb);
-	/* gtk_signal_connect(fb->search_entry, "changed", search_activate, fb); */
+	gtk_signal_connect(GTK_OBJECT (fb->search_entry), "changed", search_activate, fb);
 	searchbutton = (GtkButton *)gtk_button_new_with_label(_("Full Search"));
 	gtk_widget_show((GtkWidget *)searchbutton);
 	label = gtk_label_new(_("Search"));
@@ -493,7 +491,7 @@ folder_browser_gui_init (FolderBrowser *fb)
 	button = (GtkButton *)gtk_button_new_with_label(_("Save"));
 	gtk_widget_show((GtkWidget *)button);
 	gtk_signal_connect((GtkObject *)button, "clicked", search_save, fb);
-	/* gtk_signal_connect((GtkObject *)searchbutton, "clicked", search_full, fb); */
+	gtk_signal_connect((GtkObject *)searchbutton, "clicked", search_full, fb);
 	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)button, FALSE, FALSE, 3);
 	gtk_box_pack_end((GtkBox *)hbox, fb->search_entry, FALSE, FALSE, 3);
 	gtk_box_pack_end((GtkBox *)hbox, fb->search_menu, FALSE, FALSE, 3);