( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 manual/advanced.xml; cvs diff -u -r 1.382.2.551 -r 1.382.2.552 src/compose.c; cvs diff -u -r 1.204.2.196 -r 1.204.2.197 src/prefs_common.c; cvs diff -u -r 1.103.2.129 -r 1.103.2.130 src/prefs_common.h; ) > 3.7.6cvs7.patchset
( cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/ldapctrl.c; ) > 3.7.6cvs8.patchset
( cvs diff -u -r 1.395.2.419 -r 1.395.2.420 src/summaryview.c; cvs diff -u -r 1.68.2.55 -r 1.68.2.56 src/summaryview.h; ) > 3.7.6cvs9.patchset
+( cvs diff -u -r 1.1.2.92 -r 1.1.2.93 src/gtk/quicksearch.c; ) > 3.7.6cvs10.patchset
{
gchar *search_string = quicksearch_get_text(quicksearch);
- /* add to history */
+ prepare_matcher(quicksearch);
+
+ /* add to history, for extended search add only correct matching rules */
if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
- if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
- quicksearch->extended_search_strings =
- add_history(quicksearch->extended_search_strings,
- search_string);
- else
- quicksearch->normal_search_strings =
- add_history(quicksearch->normal_search_strings,
- search_string);
- prefs_common.summary_quicksearch_history =
- add_history(prefs_common.summary_quicksearch_history,
- search_string);
+ switch (prefs_common.summary_quicksearch_type) {
+ case QUICK_SEARCH_EXTENDED:
+ if (quicksearch->matcher_list) {
+ quicksearch->extended_search_strings =
+ add_history(quicksearch->extended_search_strings,
+ search_string);
+ prefs_common.summary_quicksearch_history =
+ add_history(prefs_common.summary_quicksearch_history,
+ search_string);
+ }
+ break;
+ default:
+ quicksearch->normal_search_strings =
+ add_history(quicksearch->normal_search_strings,
+ search_string);
+ prefs_common.summary_quicksearch_history =
+ add_history(prefs_common.summary_quicksearch_history,
+ search_string);
+ break;
+ }
+
quicksearch_set_popdown_strings(quicksearch);
+
}
- prepare_matcher(quicksearch);
if (run_only_if_fast && !quicksearch->is_fast) {
g_free(search_string);
return;
all available filtering expressions in quicksearch */
if (matcherstr->len > 0) returnstr = matcherstr->str;
else returnstr = g_strdup(search_string);
-
g_string_free(matcherstr, FALSE);
return returnstr;
}