aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog16
-rw-r--r--mail/Makefile.am2
-rw-r--r--mail/folder-browser.c8
3 files changed, 21 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index c78fdbf918..8007565e7b 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,19 @@
+2000-10-09 Ettore Perazzoli <ettore@helixcode.com>
+
+ * folder-browser.c: Don't #include "mail-search-dialogue.h" as
+ it's missing from the repository.
+ (search_full_clicked): Temporarily `#if 0'ed out.
+ (search_full): Likewise.
+ (folder_browser_gui_init): Don't connect `search_full'.
+ (create_option_menu): Don't connect `search_menu_deactivate'.
+ (folder_browser_gui_init): Don't connect `search_activate'.
+ (search_set): Don't do `search_full()'.
+ (folder_browser_gui_init): Likewise.
+
+ * Makefile.am (evolution_mail_SOURCES): Remove
+ `mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed
+ forgot to put them into CVS.
+
2000-10-06 Not Zed <NotZed@HelixCode.com>
* mail-search-dialogue.c: New widget, full search dialogue for
diff --git a/mail/Makefile.am b/mail/Makefile.am
index fb68f7a7b0..eaefe9f32b 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -65,8 +65,6 @@ evolution_mail_SOURCES = \
mail-mlist-magic.h \
mail-ops.c \
mail-ops.h \
- mail-search-dialogue.c \
- mail-search-dialogue.h \
mail-summary.c \
mail-summary.h \
mail-threads.c \
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 9518ff8e7b..f3ad51b963 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,6 +156,7 @@ static char * search_string[] = {
};
#define CUSTOM_SEARCH_ID (5)
+#if 0
static void
search_full_clicked(MailSearchDialogue *msd, guint button, FolderBrowser *fb)
{
@@ -200,6 +201,7 @@ 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)
@@ -213,7 +215,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);
@@ -491,7 +493,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);