diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-03-02 11:14:42 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-03-02 11:14:42 +0800 |
| commit | 85d0142d21286ce87cd5f6c3d1e2f71aa994151f (patch) | |
| tree | adf19534f082b2074b3c7e7faf0ef10aa5c51806 /mail/e-mail-shell-view-private.c | |
| parent | 08b1d0ae8e36ef20da800bf6358ca0cd9fb4e026 (diff) | |
| download | gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar.gz gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar.bz2 gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar.lz gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar.xz gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.tar.zst gsoc2013-evolution-85d0142d21286ce87cd5f6c3d1e2f71aa994151f.zip | |
Move text searching UI into a new EMailSearchBar widget.
svn path=/branches/kill-bonobo/; revision=37351
Diffstat (limited to 'mail/e-mail-shell-view-private.c')
| -rw-r--r-- | mail/e-mail-shell-view-private.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mail/e-mail-shell-view-private.c b/mail/e-mail-shell-view-private.c index 460856ba5e..8aecb20656 100644 --- a/mail/e-mail-shell-view-private.c +++ b/mail/e-mail-shell-view-private.c @@ -328,6 +328,7 @@ e_mail_shell_view_execute_search (EMailShellView *mail_shell_view) EShellContent *shell_content; EShellSettings *shell_settings; EMFormatHTMLDisplay *html_display; + EMailShellContent *mail_shell_content; MessageList *message_list; FilterRule *rule; EMailReader *reader; @@ -338,7 +339,7 @@ e_mail_shell_view_execute_search (EMailShellView *mail_shell_view) GtkTreeIter tree_iter; GString *string; GList *iter; - GSList *word_list = NULL; + GSList *search_strings = NULL; const gchar *folder_uri; const gchar *text; gboolean valid; @@ -356,6 +357,8 @@ e_mail_shell_view_execute_search (EMailShellView *mail_shell_view) shell = e_shell_window_get_shell (shell_window); shell_settings = e_shell_get_shell_settings (shell); + mail_shell_content = mail_shell_view->priv->mail_shell_content; + reader = E_MAIL_READER (shell_content); html_display = e_mail_reader_get_html_display (reader); message_list = e_mail_reader_get_message_list (reader); @@ -400,8 +403,8 @@ e_mail_shell_view_execute_search (EMailShellView *mail_shell_view) words = camel_search_words_split ((guchar *) text); for (ii = 0; ii < words->len; ii++) - word_list = g_slist_prepend ( - word_list, g_strdup ( + search_strings = g_slist_prepend ( + search_strings, g_strdup ( words->words[ii]->word)); camel_search_words_free (words); } @@ -550,14 +553,11 @@ filter: message_list_set_search (message_list, query); - em_format_html_display_set_search ( - html_display, - EM_FORMAT_HTML_DISPLAY_SEARCH_SECONDARY | - EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE, - word_list); + e_mail_shell_content_set_search_strings ( + mail_shell_content, search_strings); - g_slist_foreach (word_list, (GFunc) g_free, NULL); - g_slist_free (word_list); + g_slist_foreach (search_strings, (GFunc) g_free, NULL); + g_slist_free (search_strings); g_object_unref (model); g_free (query); |