[evolution/gnome-2-28] Bug #605485 - Keeps search from previous folder in message list
- From: Milan Crha <mcrha src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution/gnome-2-28] Bug #605485 - Keeps search from previous folder in message list
- Date: Mon, 11 Jan 2010 15:13:22 +0000 (UTC)
commit 42b963370ae908d2bc0b3300f018f8b8d515deaa
Author: Milan Crha <mcrha redhat com>
Date: Mon Jan 11 16:11:58 2010 +0100
Bug #605485 - Keeps search from previous folder in message list
mail/em-folder-browser.c | 2 +-
widgets/misc/e-search-bar.c | 22 +++++++++++++++-------
widgets/misc/e-search-bar.h | 2 ++
3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 54277cd..b93f4d8 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -2152,7 +2152,7 @@ emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri)
|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
- e_search_bar_set_text ((ESearchBar *)emfb->search, "");
+ e_search_bar_clear_search ((ESearchBar *)emfb->search);
if (outgoing) {
e_search_bar_set_item_id ((ESearchBar *)emfb->search, 1);
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index a65517b..c9d75e5 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -246,13 +246,7 @@ clear_verb_cb (BonoboUIComponent *ui_component,
ESearchBar *esb;
esb = E_SEARCH_BAR (data);
- gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL);
- gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL);
- gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL);
- gtk_widget_set_sensitive (esb->clear_button, FALSE);
-
- clear_search (esb);
- gtk_entry_set_text (GTK_ENTRY (esb->entry), "");
+ e_search_bar_clear_search (esb);
gtk_widget_grab_focus (esb->entry);
}
@@ -1616,6 +1610,20 @@ e_search_bar_set_ids (ESearchBar *search_bar, gint item_id, gint subitem_id)
}
+void
+e_search_bar_clear_search (ESearchBar *esb)
+{
+ g_return_if_fail (E_IS_SEARCH_BAR (esb));
+
+ gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, NULL);
+ gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, NULL);
+ gtk_widget_modify_base (esb->icon_entry, GTK_STATE_NORMAL, NULL);
+ gtk_widget_set_sensitive (esb->clear_button, FALSE);
+
+ clear_search (esb);
+ gtk_entry_set_text (GTK_ENTRY (esb->entry), "");
+}
+
/**
* e_search_bar_set_text:
* @search_bar: A search bar.
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 5385ebf..4aeab7f 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -185,6 +185,8 @@ GtkWidget *e_search_bar_get_selected_viewitem (ESearchBar *search_bar);
gint e_search_bar_get_search_scope (ESearchBar *search_bar);
+void e_search_bar_clear_search (ESearchBar *esb);
+
void e_search_bar_set_text (ESearchBar *search_bar,
const gchar *text);
gchar *e_search_bar_get_text (ESearchBar *search_bar);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]