* src/gtk/quicksearch.c
fix standard, non-extended Quick search,
was broken in 2.1.1cvs15.
Thanks to Colin.
+2006-04-20 [paul] 2.1.1cvs17
+
+ * src/gtk/quicksearch.c
+ fix standard, non-extended Quick search,
+ was broken in 2.1.1cvs15.
+ Thanks to Colin.
+
2006-04-20 [colin] 2.1.1cvs16
* src/prefs_matcher.c
( cvs diff -u -r 1.96.2.111 -r 1.96.2.112 src/textview.c; ) > 2.1.1cvs14.patchset
( cvs diff -u -r 1.382.2.265 -r 1.382.2.266 src/compose.c; cvs diff -u -r 1.50.2.23 -r 1.50.2.24 src/compose.h; cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/gtk/quicksearch.c; ) > 2.1.1cvs15.patchset
( cvs diff -u -r 1.43.2.37 -r 1.43.2.38 src/prefs_matcher.c; ) > 2.1.1cvs16.patchset
+( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/gtk/quicksearch.c; ) > 2.1.1cvs17.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
gboolean quicksearch_is_active(QuickSearch *quicksearch)
{
- return quicksearch->active && (quicksearch->matcher_list != NULL);
+ return quicksearch->active &&
+ (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED
+ || quicksearch->matcher_list != NULL);
}
static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
quicksearch->active = active;
- if (active && quicksearch->matcher_list == NULL)
+ if (active &&
+ (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED
+ && quicksearch->matcher_list == NULL))
error = TRUE;
if (active) {