2011-08-12 [wwp] 3.7.9cvs44
[claws.git] / src / gtk / quicksearch.c
index 0092138bfb92e294c1a184bf5c84b4610bf48710..62dd49304cd575ec4cf690e993ae4c8991b8e9b3 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net> 
+ * Copyright (C) 1999-2011 Colin Leroy <colin@colino.net> 
  * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
 #include "claws.h"
 #include "statusbar.h"
 
+struct _QuickSearchRequest
+{
+       QuickSearchType                  type;
+       gchar                           *matchstring;
+       FolderItem                      *folderItem;
+       gboolean                         recursive;
+};
+typedef struct _QuickSearchRequest QuickSearchRequest;
+
 struct _QuickSearch
 {
        GtkWidget                       *hbox_search;
@@ -58,6 +67,7 @@ struct _QuickSearch
        gchar                           *search_string;
        MatcherList                     *matcher_list;
 
+       QuickSearchRequest              *request;
        QuickSearchExecuteCallback       callback;
        gpointer                         callback_data;
        gboolean                         running;
@@ -69,25 +79,44 @@ struct _QuickSearch
        gboolean                         in_typing;
        guint                            press_timeout_id;
 
+       GList                           *normal_search_strings;
+       GList                           *extended_search_strings;
+       
        /* dynamic and autorun qs settings are exclusive*/
        GtkWidget                        *dynamic_menuitem;
        GtkWidget                        *autorun_menuitem;
+
+       gboolean                        gui;
 };
 
 static void quicksearch_set_running(QuickSearch *quicksearch, gboolean run);
+static void quicksearch_set_matchstring(QuickSearch *quicksearch, const gchar *matchstring);
 static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active);
 static void quicksearch_reset_folder_items(QuickSearch *quicksearch, FolderItem *folder_item);
 static gchar *expand_search_string(const gchar *str);
 static gchar *expand_tag_search_string(const gchar *str);
 
+static gboolean quicksearch_from_gui(QuickSearch *quicksearch)
+{
+       return quicksearch->gui;
+}
+
 gboolean quicksearch_is_fast(QuickSearch *quicksearch)
 {
        return quicksearch->is_fast;
 }
 
+void quicksearch_set_recursive(QuickSearch *quicksearch, gboolean recursive)
+{
+       quicksearch->request->recursive = recursive;
+}
+
 static void quicksearch_set_type(QuickSearch *quicksearch, gint type)
 {
        gint index;
+       quicksearch->request->type = type;
+       if (quicksearch->gui == FALSE)
+               return;
        index = menu_find_option_menu_index(GTK_CMOPTION_MENU(quicksearch->search_type_opt), 
                                        GINT_TO_POINTER(type),
                                        NULL);
@@ -102,9 +131,38 @@ static gchar *quicksearch_get_text(QuickSearch * quicksearch)
        return search_string;
 }
 
+static void quicksearch_set_popdown_strings(QuickSearch *quicksearch)
+{
+       GtkWidget *search_string_entry = quicksearch->search_string_entry;
+
+       combobox_unset_popdown_strings(GTK_COMBO_BOX(search_string_entry));
+
+       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED)
+               combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
+                       quicksearch->extended_search_strings);  
+       else
+               combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
+                       quicksearch->normal_search_strings);
+}
+
 static void prepare_matcher(QuickSearch *quicksearch)
 {
-       gchar *search_string = quicksearch_get_text(quicksearch);
+       /* param search_string is "matchstring" */
+       const gchar *search_string;
+       QuickSearchType quicksearch_type;
+
+       if (quicksearch == NULL)
+               return;
+
+       /* When called from the GUI, reset type and matchstring */
+       if (quicksearch_from_gui(quicksearch)) {
+               gchar *s = quicksearch_get_text(quicksearch);
+               quicksearch_set_matchstring(quicksearch, s);
+               g_free(s);
+               quicksearch->request->type = prefs_common.summary_quicksearch_type;
+       }
+       quicksearch_type = quicksearch->request->type;
+       search_string = quicksearch->request->matchstring;
 
        if (search_string == NULL || search_string[0] == '\0') {
                quicksearch_set_active(quicksearch, FALSE);
@@ -113,7 +171,6 @@ static void prepare_matcher(QuickSearch *quicksearch)
        if (quicksearch->matcher_list != NULL) {
                if (quicksearch->matching) {
                        quicksearch->deferred_free = TRUE;
-                       g_free(search_string);
                        return;
                }
                quicksearch->deferred_free = FALSE;
@@ -122,11 +179,9 @@ static void prepare_matcher(QuickSearch *quicksearch)
        }
 
        if (search_string == NULL || search_string[0] == '\0') {
-               g_free(search_string);
                return;
        }
-
-       if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
+       if (quicksearch_type == QUICK_SEARCH_EXTENDED) {
                char *newstr = NULL;
 
                newstr = expand_search_string(search_string);
@@ -136,14 +191,13 @@ static void prepare_matcher(QuickSearch *quicksearch)
                } else {
                        quicksearch->matcher_list = NULL;
                        quicksearch_set_active(quicksearch, FALSE);
-                       g_free(search_string);
                        return;
                }
-       } else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_TAG) {
+       } else if (quicksearch_type == QUICK_SEARCH_TAG) {
                char *newstr = expand_tag_search_string(search_string);
                quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
                g_free(newstr);
-       } else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_MIXED) {
+       } else if (quicksearch_type == QUICK_SEARCH_MIXED) {
                char *newstr = expand_tag_search_string(search_string);
                quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
                g_free(newstr);
@@ -154,8 +208,6 @@ static void prepare_matcher(QuickSearch *quicksearch)
                g_free(quicksearch->search_string);
                quicksearch->search_string = g_utf8_casefold(search_string, -1);
        }
-
-       g_free(search_string);
        quicksearch_set_active(quicksearch, TRUE);
 }
 
@@ -199,18 +251,36 @@ gboolean quicksearch_has_focus(QuickSearch *quicksearch)
 static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
 {
        gchar *search_string = quicksearch_get_text(quicksearch);
+       quicksearch_set_matchstring(quicksearch, search_string);
+       prepare_matcher(quicksearch);
 
-       /* add to history */
+       /* add to history, for extended search add only correct matching rules */
        if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
-               combobox_unset_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry));
-               prefs_common.summary_quicksearch_history =
-                       add_history(prefs_common.summary_quicksearch_history,
-                                       search_string);
-               combobox_set_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry),
-                       prefs_common.summary_quicksearch_history);
+               switch (prefs_common.summary_quicksearch_type) {
+                       case QUICK_SEARCH_EXTENDED:
+                               if (quicksearch->matcher_list) {
+                                       quicksearch->extended_search_strings =
+                                               add_history(quicksearch->extended_search_strings,
+                                                               g_strdup(search_string));
+                                       prefs_common.summary_quicksearch_history =
+                                               add_history(prefs_common.summary_quicksearch_history,
+                                                               g_strdup(search_string));
+                               }
+                               break;
+                       default:
+                               quicksearch->normal_search_strings =
+                                       add_history(quicksearch->normal_search_strings,
+                                                       g_strdup(search_string));               
+                               prefs_common.summary_quicksearch_history =
+                                       add_history(prefs_common.summary_quicksearch_history,
+                                                       g_strdup(search_string));
+                               break;
+               }
+
+               quicksearch_set_popdown_strings(quicksearch);
+
        }
 
-       prepare_matcher(quicksearch);
        if (run_only_if_fast && !quicksearch->is_fast) {
                g_free(search_string);
                return;
@@ -310,6 +380,7 @@ static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
        QuickSearch *quicksearch = (QuickSearch *)data;
        gchar *search_string = quicksearch_get_text(quicksearch);
+       quicksearch_set_matchstring(quicksearch, search_string);
 
        prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
                                   G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
@@ -317,6 +388,7 @@ static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
 
        /* Show extended search description button, only when Extended is selected */
        update_extended_buttons(quicksearch);
+       quicksearch_set_popdown_strings(quicksearch);
 
        if (!search_string || *(search_string) == 0) {
                g_free(search_string);
@@ -338,8 +410,11 @@ static gboolean searchtype_recursive_changed(GtkMenuItem *widget, gpointer data)
        QuickSearch *quicksearch = (QuickSearch *)data;
        gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
        gchar *search_string = quicksearch_get_text(quicksearch);
+       /* not needed to quicksearch_set_matchstring(search_string);
+          wait for prepare_matcher() */
 
        prefs_common.summary_quicksearch_recurse = checked;
+       quicksearch_set_recursive(quicksearch, checked);
 
        /* reselect the search type */
        quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
@@ -537,6 +612,68 @@ static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
        return TRUE;
 };
 
+static void quicksearch_set_button(GtkButton *button, const gchar *icon, const gchar *text)
+{
+       GList *children = gtk_container_get_children(GTK_CONTAINER(button));
+       GList *cur;
+       GtkWidget *box;
+       gboolean icon_visible;
+
+       g_object_get(gtk_settings_get_default(), 
+                                        "gtk-button-images", &icon_visible, 
+                                        NULL);
+
+       for (cur = children; cur; cur = cur->next)
+               gtk_container_remove(GTK_CONTAINER(button), GTK_WIDGET(cur->data));
+       
+       g_list_free(children);
+       box = gtk_hbox_new(FALSE, 0);
+       
+       gtk_container_add(GTK_CONTAINER(button), box);
+       if (icon_visible || !text || !*text)
+               gtk_box_pack_start(GTK_BOX(box), gtk_image_new_from_stock(icon, 
+                       GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(box), gtk_label_new_with_mnemonic(text), FALSE, FALSE, 0);
+       gtk_widget_show_all(box);
+}
+
+/*
+ * Builds a new QuickSearchRequest
+ */
+static QuickSearchRequest *quicksearchrequest_new(void)
+{
+       QuickSearchRequest *request;
+       request = g_new0(QuickSearchRequest, 1);
+       return request;
+}
+
+/*
+ * Builds a new QuickSearch object independent from the GUI
+ */
+QuickSearch *quicksearch_new_nogui(void)
+{
+       QuickSearch *quicksearch;
+       QuickSearchRequest *request;
+
+       request = quicksearchrequest_new();
+       quicksearch = g_new0(QuickSearch, 1);
+       quicksearch->request = request;
+       quicksearch->gui = FALSE;
+
+       /* init. values initally found in quicksearch_new().
+          There's no need to init. all pointers to NULL since we use g_new0
+        */
+       quicksearch->matcher_list = NULL;
+       quicksearch->active = FALSE;
+       quicksearch->running = FALSE;
+       quicksearch->in_typing = FALSE;
+       quicksearch->press_timeout_id = -1;
+       quicksearch->normal_search_strings = NULL;
+       quicksearch->extended_search_strings = NULL;
+
+       return quicksearch;
+}
+
 QuickSearch *quicksearch_new()
 {
        QuickSearch *quicksearch;
@@ -553,7 +690,8 @@ QuickSearch *quicksearch_new()
        CLAWS_TIP_DECL();
        GtkWidget *vbox;
 
-       quicksearch = g_new0(QuickSearch, 1);
+       quicksearch = quicksearch_new_nogui();
+       quicksearch->gui = TRUE;
 
        /* quick search */
        hbox_search = gtk_hbox_new(FALSE, 0);
@@ -600,7 +738,7 @@ QuickSearch *quicksearch_new()
 
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                        prefs_common.summary_quicksearch_recurse);
-
+       quicksearch_set_recursive(quicksearch, prefs_common.summary_quicksearch_recurse);
        g_signal_connect(G_OBJECT(menuitem), "activate",
                         G_CALLBACK(searchtype_recursive_changed),
                         quicksearch);
@@ -648,9 +786,6 @@ QuickSearch *quicksearch_new()
 
        search_string_entry = gtk_combo_box_entry_new_text ();
        gtk_combo_box_set_active(GTK_COMBO_BOX(search_string_entry), -1);
-       if (prefs_common.summary_quicksearch_history)
-               combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
-                       prefs_common.summary_quicksearch_history);
 
        vbox = gtk_vbox_new(TRUE, 0);
        gtk_box_pack_start(GTK_BOX(vbox), search_string_entry, FALSE, FALSE, 0);
@@ -660,12 +795,7 @@ QuickSearch *quicksearch_new()
        gtk_widget_show(search_string_entry);
 
        search_hbox = gtk_hbox_new(FALSE, 5);
-
-#if GTK_CHECK_VERSION(2, 8, 0)
        clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
-#else
-       clear_search = gtk_button_new_with_label(_(" Clear "));
-#endif
        gtk_box_pack_start(GTK_BOX(search_hbox), clear_search,
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(clear_search), "clicked",
@@ -674,11 +804,7 @@ QuickSearch *quicksearch_new()
                             _("Clear the current search"));
        gtk_widget_show(clear_search);
 
-#if GTK_CHECK_VERSION(2, 8, 0)
        search_condition_expression = gtk_button_new_from_stock(GTK_STOCK_EDIT);
-#else
-       search_condition_expression = gtk_button_new_with_label(" ... ");
-#endif
        gtk_box_pack_start(GTK_BOX(search_hbox), search_condition_expression,
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT (search_condition_expression), "clicked",
@@ -688,11 +814,7 @@ QuickSearch *quicksearch_new()
                             _("Edit search criteria"));
        gtk_widget_show(search_condition_expression);
 
-#if GTK_CHECK_VERSION(2, 8, 0)
        search_description = gtk_button_new_from_stock(GTK_STOCK_INFO);
-#else
-       search_description = gtk_button_new_with_label(_(" Extended Symbols... "));
-#endif
        gtk_box_pack_start(GTK_BOX(search_hbox), search_description,
                           FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(search_description), "clicked",
@@ -734,7 +856,13 @@ QuickSearch *quicksearch_new()
        quicksearch->clear_search = clear_search;
        quicksearch->in_typing = FALSE;
        quicksearch->press_timeout_id = -1;
+       quicksearch->normal_search_strings = NULL;
+       quicksearch->extended_search_strings = NULL;
 
+       quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
+       quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
+       quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
+       
        update_extended_buttons(quicksearch);
 
        return quicksearch;
@@ -746,33 +874,15 @@ void quicksearch_relayout(QuickSearch *quicksearch)
        case NORMAL_LAYOUT:
        case WIDE_LAYOUT:
        case WIDE_MSGLIST_LAYOUT:
-#if GTK_CHECK_VERSION(2, 8, 0)
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO);
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT);
-               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR);
-#else
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _(" Extended Symbols... "));
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), " ... ");
-               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _(" Clear "));
-#endif
+               quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, _("_Information"));
+               quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit"));
+               quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("C_lear"));
                break;
+       case SMALL_LAYOUT:
        case VERTICAL_LAYOUT:
-#if GTK_CHECK_VERSION(2, 8, 0)
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), "");
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "");
-               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), "");
-
-               gtk_button_set_image(GTK_BUTTON(quicksearch->search_description),
-                       gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_BUTTON));
-               gtk_button_set_image(GTK_BUTTON(quicksearch->search_condition_expression),
-                       gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON));
-               gtk_button_set_image(GTK_BUTTON(quicksearch->clear_search),
-                       gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_BUTTON));
-#else
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_description), _("Info"));
-               gtk_button_set_label(GTK_BUTTON(quicksearch->search_condition_expression), "...");
-               gtk_button_set_label(GTK_BUTTON(quicksearch->clear_search), _("Clear"));
-#endif
+               quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, "");
+               quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, "");
+               quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, "");
                break;
        }
 }
@@ -815,6 +925,19 @@ void quicksearch_hide(QuickSearch *quicksearch)
        gtk_widget_hide(quicksearch->hbox_search);
 }
 
+/*
+ *\brief       Sets the matchstring.
+ *
+ *\param       quicksearch quicksearch to set
+ *\param       matchstring the match string; it is duplicated, not stored
+ */
+static void quicksearch_set_matchstring(QuickSearch *quicksearch,
+                                       const gchar *matchstring)
+{
+       g_free(quicksearch->request->matchstring);
+       quicksearch->request->matchstring = g_strdup(matchstring);
+}
+
 void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
                     const gchar *matchstring)
 {
@@ -823,12 +946,20 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
        if (!matchstring || !(*matchstring))
                quicksearch->in_typing = FALSE;
 
+       quicksearch_set_matchstring(quicksearch, matchstring);
+
+       if (!quicksearch_from_gui(quicksearch)) {
+               prepare_matcher(quicksearch);
+               /* no callback */
+               return;
+       }
+               
        g_signal_handlers_block_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
-                       G_CALLBACK(searchbar_changed_cb), quicksearch);
+                                       G_CALLBACK(searchbar_changed_cb), quicksearch);
        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
                           matchstring);
        g_signal_handlers_unblock_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
-                       G_CALLBACK(searchbar_changed_cb), quicksearch);
+                                         G_CALLBACK(searchbar_changed_cb), quicksearch);
 
        prefs_common.summary_quicksearch_type = type;
 
@@ -855,6 +986,11 @@ static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
        static gboolean colors_initialised = FALSE;
        gboolean error = FALSE;
 
+       
+       quicksearch->active = active;
+       if (quicksearch->gui == FALSE)
+               return;
+
        if (!colors_initialised) {
                gdk_color_parse("#f5f6be", &yellow);
                gdk_color_parse("#000000", &black);
@@ -867,8 +1003,6 @@ static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
                        gdk_colormap_get_system(), &red, FALSE, TRUE);
        }
 
-       quicksearch->active = active;
-
        if (active && 
                (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED
                 && quicksearch->matcher_list == NULL))
@@ -914,11 +1048,14 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
        gchar *searched_header = NULL;
        gboolean result = FALSE;
        gchar *to = NULL, *from = NULL, *subject = NULL;
+       QuickSearchType quicksearch_type;
 
        if (!quicksearch->active)
                return TRUE;
 
-       switch (prefs_common.summary_quicksearch_type) {
+       quicksearch_type = quicksearch->request->type;
+
+       switch (quicksearch_type) {
        case QUICK_SEARCH_SUBJECT:
                if (msginfo->subject)
                        searched_header = g_utf8_casefold(msginfo->subject, -1);
@@ -948,31 +1085,34 @@ gboolean quicksearch_match(QuickSearch *quicksearch, MsgInfo *msginfo)
        case QUICK_SEARCH_EXTENDED:
                break;
        default:
-               debug_print("unknown search type (%d)\n", prefs_common.summary_quicksearch_type);
+               debug_print("unknown search type (%d)\n", quicksearch_type);
                break;
        }
 
        quicksearch->matching = TRUE;
-       if (prefs_common.summary_quicksearch_type != QUICK_SEARCH_EXTENDED &&
-           prefs_common.summary_quicksearch_type != QUICK_SEARCH_MIXED &&
-           prefs_common.summary_quicksearch_type != QUICK_SEARCH_TAG &&
+       if (quicksearch_type != QUICK_SEARCH_EXTENDED &&
+           quicksearch_type != QUICK_SEARCH_MIXED &&
+           quicksearch_type != QUICK_SEARCH_TAG &&
            quicksearch->search_string &&
-            searched_header && strstr(searched_header, quicksearch->search_string) != NULL)
+           searched_header && strstr(searched_header, quicksearch->search_string) != NULL)
                result = TRUE;
-       else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_MIXED &&
+       else if (quicksearch_type == QUICK_SEARCH_MIXED &&
                quicksearch->search_string && (
                (to && strstr(to, quicksearch->search_string) != NULL) ||
                (from && strstr(from, quicksearch->search_string) != NULL) ||
                (subject && strstr(subject, quicksearch->search_string) != NULL) ||
                ((quicksearch->matcher_list != NULL) &&
-                matcherlist_match(quicksearch->matcher_list, msginfo))  ))
+                matcherlist_match(quicksearch->matcher_list, msginfo))  ))
                result = TRUE;
        else if ((quicksearch->matcher_list != NULL) &&
-                matcherlist_match(quicksearch->matcher_list, msginfo))
+                matcherlist_match(quicksearch->matcher_list, msginfo))
                result = TRUE;
 
        quicksearch->matching = FALSE;
-       if (quicksearch->deferred_free) {
+       if (quicksearch_from_gui(quicksearch)==TRUE && quicksearch->deferred_free) {
+               /* Ref. http://lists.claws-mail.org/pipermail/users/2010-August/003063.html
+                  See also 2.0.0cvs140 ChangeLog entry
+                  and comment in search_msgs_in_folder() */
                prepare_matcher(quicksearch);
        }
 
@@ -1159,7 +1299,6 @@ static gchar *expand_search_string(const gchar *search_string)
           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;
 }
@@ -1351,3 +1490,148 @@ gboolean quicksearch_is_in_typing(QuickSearch *quicksearch)
 {
        return quicksearch->in_typing;
 }
+
+void quicksearch_set_search_strings(QuickSearch *quicksearch)
+{
+       GList *strings = prefs_common.summary_quicksearch_history;
+       gchar *newstr = NULL;
+       MatcherList *matcher_list = NULL;
+
+       if (!strings)
+               return;
+
+       matcher_parser_disable_warnings(TRUE);
+       
+       do {
+               newstr = expand_search_string((gchar *) strings->data);
+               if (newstr && newstr[0] != '\0') {
+                       if (!strchr(newstr, ' ')) {
+                               quicksearch->normal_search_strings =
+                                       g_list_append(
+                                               quicksearch->normal_search_strings,
+                                               g_strdup(strings->data));
+                               g_free(newstr);
+                               continue;
+                       }
+                       
+                       matcher_list = matcher_parser_get_cond(newstr, FALSE);
+                       g_free(newstr);
+                       
+                       if (matcher_list) {
+                               quicksearch->extended_search_strings =
+                                       g_list_prepend(
+                                               quicksearch->extended_search_strings,
+                                               g_strdup(strings->data));
+                               matcherlist_free(matcher_list);
+                       } else
+                               quicksearch->normal_search_strings =
+                                       g_list_prepend(
+                                               quicksearch->normal_search_strings,
+                                               g_strdup(strings->data));
+               }
+       
+       } while ((strings = g_list_next(strings)) != NULL);
+
+       matcher_parser_disable_warnings(FALSE); 
+
+       quicksearch->normal_search_strings = g_list_reverse(quicksearch->normal_search_strings);
+       quicksearch->extended_search_strings = g_list_reverse(quicksearch->extended_search_strings);
+
+       quicksearch_set_popdown_strings(quicksearch);
+}
+
+/*
+ * Searches in the supplied folderItem the messages (MessageInfo) matching a
+ * QuickSearchType + search string (ex.: QUICK_SEARCH_FROM and "foo@bar.com").
+ *
+ * Found messages are appended to the array 'messages' and their ref.counts
+ * are incremented by 1 --so they need to be released (procmsg_msginfo_free())
+ * before the array 'messages' is freed.
+ */
+void search_msgs_in_folder(GSList **messages, QuickSearch* quicksearch,
+                          FolderItem* folderItem)
+{
+       /* from quicksearch_match_subfolder */
+       GSList *msglist = NULL;
+       GSList *cur;
+
+       /* The list is built w/ MsgInfo items whose ref.counts are incremented,
+          but they are decremented when the list is freed by
+          procmsg_msg_list_free(): we'll  ask for a new ref., below
+       */
+       msglist = folder_item_get_msg_list(folderItem);
+
+       for (cur = msglist; cur != NULL; cur = cur->next) {
+               MsgInfo *msg = (MsgInfo *)cur->data;
+               if (quicksearch_match(quicksearch, msg)) {
+                       /*debug_print("found: %s from:%s\n",procmsg_get_message_file_path(msg),msg->from);*/
+                       *messages = g_slist_prepend(*messages, procmsg_msginfo_new_ref(msg));
+               }
+               /* See 2.0.0cvs140 ChangeLog entry for details
+                  see also comments in quicksearch_match() */
+               if (quicksearch_from_gui(quicksearch)==TRUE
+                   && !quicksearch_is_active(quicksearch))
+                       break;
+       }
+       procmsg_msg_list_free(msglist);
+}
+
+/*
+ * Searches within the folderItem and its sub-folders (if recursive is TRUE)
+ * the messages matching the search request.
+ *
+ * NB: search within a Folder can be done this way:
+ *         search_msg_in_folders(messages, quicksearch, searchType,
+ *                               FOLDER_ITEM(folder->node->data), TRUE);
+ */
+void search_msgs_in_folders(GSList **messages, QuickSearch* quicksearch,
+                           FolderItem* folderItem)
+{
+       FolderItem *cur = NULL;
+
+       search_msgs_in_folder(messages, quicksearch, folderItem);
+       if (quicksearch->request->recursive == FALSE)
+               return;
+
+       GNode *node = folderItem->node->children;
+       for (; node != NULL; node = node->next) {
+               cur = FOLDER_ITEM(node->data);
+               debug_print("in: %s\n",cur->path);
+               if (cur->node->children)
+                       search_msgs_in_folders(messages, quicksearch, cur);
+               else
+                       search_msgs_in_folder(messages, quicksearch, cur);
+       }
+       *messages = g_slist_reverse(*messages);
+}
+
+ /*
+  * Returns the QuickSearchType associated to the supplied string.
+  */
+QuickSearchType quicksearch_type(const gchar* type)
+{
+       QuickSearchType searchType = QUICK_SEARCH_EXTENDED;
+       if (!type)
+               return searchType;
+       switch(toupper(*type)) {
+       case 'S':
+               searchType = QUICK_SEARCH_SUBJECT;
+       break;
+       case 'F':
+               searchType = QUICK_SEARCH_FROM;
+       break;
+       case 'T':
+               searchType = QUICK_SEARCH_TO;
+       break;
+       case 'E':
+               searchType = QUICK_SEARCH_EXTENDED;
+       break;
+       case 'M':
+               searchType = QUICK_SEARCH_MIXED;
+       break;
+       case 'G':
+               searchType = QUICK_SEARCH_TAG;
+       break;
+       }
+       return searchType;
+}