aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/folder-browser.c8
-rw-r--r--mail/folder-browser.h1
-rw-r--r--mail/mail-ops.c2
4 files changed, 16 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7e792895d7..c023d9dbed 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2000-06-15 Dan Winship <danw@helixcode.com>
+ * folder-browser.c (folder_browser_clear_search): New function to
+ revert back to non-searching mode.
+
+ * mail-ops.c (fetch_mail): Use folder_browser_clear_search.
+
* mail-display.c (on_url_requested): if the document requests an
unknown URL, it's not an error; just ignore the URL.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 7a6b751842..78397a9138 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -259,6 +259,14 @@ search_activate(GtkEntry *entry, FolderBrowser *fb)
search_set(fb);
}
+void
+folder_browser_clear_search (FolderBrowser *fb)
+{
+ gtk_entry_set_text (GTK_ENTRY (fb->search_entry), "");
+ gtk_option_menu_set_history (GTK_OPTION_MENU (fb->search_menu), 0);
+ message_list_set_search (fb->message_list, NULL);
+}
+
static int
etable_key (ETable *table, int row, int col, GdkEvent *ev, FolderBrowser *fb)
{
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index 5c385268bd..ae16b64153 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -61,5 +61,6 @@ gboolean folder_browser_set_uri (FolderBrowser *folder_browser,
const char *uri);
void folder_browser_set_message_preview (FolderBrowser *folder_browser,
gboolean show_message_preview);
+void folder_browser_clear_search (FolderBrowser *fb);
#endif /* _FOLDER_BROWSER_H_ */
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 2e5100b5cb..b192f2244c 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -236,6 +236,8 @@ fetch_mail (GtkWidget *button, gpointer user_data)
goto cleanup;
}
+ folder_browser_clear_search (fb);
+
/* apply filtering rules to this inbox */
filter = filter_driver_new();
userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);