diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2002-09-12 05:46:15 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2002-09-12 05:46:15 +0800 |
| commit | 9b1732a7825e666762c979da7428019eeb9f1aa4 (patch) | |
| tree | 95dfeee7b358d47bf382ae2bd89900bea44b0e9b | |
| parent | fd5752f425eb6e440ff4f6f8bde81e8b834fb2f2 (diff) | |
| download | gsoc2013-evolution-9b1732a7825e666762c979da7428019eeb9f1aa4.tar.gz gsoc2013-evolution-9b1732a7825e666762c979da7428019eeb9f1aa4.tar.zst gsoc2013-evolution-9b1732a7825e666762c979da7428019eeb9f1aa4.zip | |
Only abort if the user selected ADVANCED_SEARCH, not the other way around.
2002-09-11 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser.c (folder_browser_query_changed): Only abort if
the user selected ADVANCED_SEARCH, not the other way around. Any
other menu item and we are supposed to perform an actual
search. Fixes bug #30183.
svn path=/trunk/; revision=18048
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 868553f971..b77454f3d5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,10 @@ 2002-09-11 Jeffrey Stedfast <fejj@ximian.com> + * folder-browser.c (folder_browser_query_changed): Only abort if + the user selected ADVANCED_SEARCH, not the other way around. Any + other menu item and we are supposed to perform an actual + search. Fixes bug #30183. + * mail-display.c (pixbuf_for_mime_type): check the new gnome-vfs icon_filename key. If that fails, fall back to checking icon-filename. Also don't leak the fm_icon string and rearranged diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 0d31cb479a..008d62dd8d 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -1216,9 +1216,9 @@ folder_browser_search_do_search (ESearchBar *esb, FolderBrowser *fb) static void folder_browser_query_changed (ESearchBar *esb, FolderBrowser *fb) { - if (e_search_bar_get_item_id (esb) != E_FILTERBAR_ADVANCED_ID) + if (e_search_bar_get_item_id (esb) == E_FILTERBAR_ADVANCED_ID) return; - + folder_browser_search_do_search (esb, fb); } |