aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-03-27 06:33:00 +0800
committerMichael Meeks <michael.meeks@novell.com>2010-04-07 19:25:13 +0800
commitd9fb3008135d71dcbc512325087aceb19016ace7 (patch)
treeacac1032028ab6c239e020238718e266ef3e3f5e /modules/mail
parent0fbbec2153df8664d0b94a65d9e9df465fa8432c (diff)
downloadgsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.gz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.bz2
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.lz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.xz
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.tar.zst
gsoc2013-evolution-d9fb3008135d71dcbc512325087aceb19016ace7.zip
Simplify the search UI for express mode.
For express mode: - Move the search bar up to the toolbar. - Hide the "filter" combo box and lock down the first item. - Hide the "scope" combo box and lock down the first item. (This is the combo box with "Current Folder" only in the mailer.) - EShellView owns the search bar widget now instead of EShellContent. - Insert several nasty hacks that will likely come back to bite me. Conflicts: doc/reference/shell/eshell-sections.txt
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-content.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 17eb613b32..67d58ce094 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -869,6 +869,7 @@ e_mail_shell_content_set_preview_visible (EMailShellContent *mail_shell_content,
EShellSearchbar *
e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content)
{
+ EShellView *shell_view;
EShellContent *shell_content;
GtkWidget *widget;
@@ -876,7 +877,8 @@ e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content)
E_IS_MAIL_SHELL_CONTENT (mail_shell_content), NULL);
shell_content = E_SHELL_CONTENT (mail_shell_content);
- widget = e_shell_content_get_searchbar (shell_content);
+ shell_view = e_shell_content_get_shell_view (shell_content);
+ widget = e_shell_view_get_searchbar (shell_view);
return E_SHELL_SEARCHBAR (widget);
}