/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net>
+ * Copyright (C) 1999-2009 Colin Leroy <colin@colino.net>
* and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include "gtkcmoptionmenu.h"
#include "utils.h"
#include "combobox.h"
#include "menu.h"
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;
static void quicksearch_set_type(QuickSearch *quicksearch, gint type)
{
gint index;
- index = menu_find_option_menu_index(GTK_OPTION_MENU(quicksearch->search_type_opt),
+ index = menu_find_option_menu_index(GTK_CMOPTION_MENU(quicksearch->search_type_opt),
GINT_TO_POINTER(type),
NULL);
- gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt), index);
+ gtk_cmoption_menu_set_history(GTK_CMOPTION_MENU(quicksearch->search_type_opt), index);
+}
+
+static gchar *quicksearch_get_text(QuickSearch * quicksearch)
+{
+ gchar *search_string = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))), 0, -1);
+
+ g_strstrip(search_string);
+ 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)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
if (search_string == NULL || search_string[0] == '\0') {
quicksearch_set_active(quicksearch, FALSE);
if (quicksearch->matcher_list != NULL) {
if (quicksearch->matching) {
quicksearch->deferred_free = TRUE;
+ g_free(search_string);
return;
}
quicksearch->deferred_free = FALSE;
}
if (search_string == NULL || search_string[0] == '\0') {
+ g_free(search_string);
return;
}
} 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) {
quicksearch->matcher_list = matcher_parser_get_cond(newstr, &quicksearch->is_fast);
g_free(newstr);
g_free(quicksearch->search_string);
- quicksearch->search_string = g_strdup(search_string);
+ quicksearch->search_string = g_utf8_casefold(search_string, -1);
} else {
quicksearch->is_fast = TRUE;
g_free(quicksearch->search_string);
- quicksearch->search_string = g_strdup(search_string);
+ quicksearch->search_string = g_utf8_casefold(search_string, -1);
}
+ g_free(search_string);
quicksearch_set_active(quicksearch, TRUE);
}
GtkWidget *expr_btn = quicksearch->search_condition_expression;
GtkWidget *ext_btn = quicksearch->search_description;
- g_return_if_fail(expr_btn != NULL);
- g_return_if_fail(ext_btn != NULL);
+ cm_return_if_fail(expr_btn != NULL);
+ cm_return_if_fail(ext_btn != NULL);
if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED) {
gtk_widget_show(expr_btn);
static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ 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) {
- 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)
+ if (run_only_if_fast && !quicksearch->is_fast) {
+ g_free(search_string);
return;
+ }
if (quicksearch->matcher_list == NULL &&
prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED &&
- search_string && strlen(search_string) != 0)
+ search_string && strlen(search_string) != 0) {
+ g_free(search_string);
return;
+ }
quicksearch_set_running(quicksearch, TRUE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
}
static int searchbar_changed_timeout(void *data)
QuickSearch *quicksearch)
{
if (event && (event->keyval == GDK_Escape)) {
- const gchar *str;
+ gchar *str;
quicksearch->in_typing = FALSE;
- str = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
- g_return_val_if_fail(str != NULL, TRUE);
+ str = quicksearch_get_text(quicksearch);
+ cm_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
if (!*str) {
gtk_widget_grab_focus(
mainwindow_get_mainwindow()->summaryview->ctree);
}
+ g_free(str);
return TRUE;
}
static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
/* Show extended search description button, only when Extended is selected */
update_extended_buttons(quicksearch);
+ quicksearch_set_popdown_strings(quicksearch);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
return TRUE;
}
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
return TRUE;
}
{
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_recurse = checked;
/* reselect the search type */
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
return TRUE;
}
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
+ g_free(search_string);
return TRUE;
}
"F", N_("forwarded messages"),
"h S", N_("messages which contain header S"),
"i S", N_("messages which contain S in Message-ID header"),
- "I S", N_("messages which contain S in inreplyto header"),
+ "I S", N_("messages which contain S in In-Reply-To header"),
"k #", N_("messages which are marked with color #"),
"L", N_("locked messages"),
"n S", N_("messages which are in newsgroup S"),
2,
N_("Extended Search"),
N_("Extended Search allows the user to define criteria that messages must "
- "have in order to match and be displayed in the message list.\n\n"
+ "have in order to match and be displayed in the message list.\n"
"The following symbols can be used:"),
search_descr_strings
};
{
gchar *str;
- g_return_if_fail(
+ cm_return_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL);
if (matchers == NULL)
static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
{
- const gchar * cond_str;
+ gchar * cond_str;
MatcherList * matchers = NULL;
- g_return_val_if_fail(
+ cm_return_val_if_fail(
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL,
FALSE);
/* re-use the current quicksearch value if it's a condition expression,
otherwise ignore it silently */
- cond_str = gtk_entry_get_text(
- GTK_ENTRY(GTK_BIN(mainwindow_get_mainwindow()->summaryview->quicksearch->
- search_string_entry)->child));
+ cond_str = quicksearch_get_text(mainwindow_get_mainwindow()->summaryview->quicksearch);
+
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
if (matchers != NULL)
matcherlist_free(matchers);
+ g_free(cond_str);
+
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);
+}
+
QuickSearch *quicksearch_new()
{
QuickSearch *quicksearch;
GtkWidget *clear_search;
GtkWidget *search_condition_expression;
GtkWidget *menuitem;
- GtkTooltips *tips = gtk_tooltips_new();
+ CLAWS_TIP_DECL();
GtkWidget *vbox;
quicksearch = g_new0(QuickSearch, 1);
/* quick search */
hbox_search = gtk_hbox_new(FALSE, 0);
- search_type_opt = gtk_option_menu_new();
+ search_type_opt = gtk_cmoption_menu_new();
gtk_widget_show(search_type_opt);
gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
G_CALLBACK(searchtype_autorun_changed),
quicksearch);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
+ gtk_cmoption_menu_set_menu(GTK_CMOPTION_MENU(search_type_opt), search_type);
quicksearch->search_type_opt = search_type_opt;
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
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);
- gtk_box_pack_start(GTK_BOX(hbox_search), vbox, FALSE, FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(hbox_search), vbox, TRUE, TRUE, 4);
gtk_widget_show(vbox);
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",
G_CALLBACK(clear_search_cb), quicksearch);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
- clear_search,
- _("Clear the current search"), NULL);
+ CLAWS_SET_TIP(clear_search,
+ _("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",
G_CALLBACK(search_condition_expr),
quicksearch);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
- search_condition_expression,
- _("Edit search criteria"), NULL);
+ CLAWS_SET_TIP(search_condition_expression,
+ _("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",
G_CALLBACK(search_description_cb), NULL);
- gtk_tooltips_set_tip(GTK_TOOLTIPS(tips),
- search_description,
- _("Information about extended symbols"), NULL);
+ CLAWS_SET_TIP(search_description,
+ _("Information about extended symbols"));
gtk_widget_show(search_description);
gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
gtk_widget_show(search_hbox);
- g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((search_string_entry)))),
"key_press_event",
G_CALLBACK(searchbar_pressed),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((search_string_entry)))),
"changed",
G_CALLBACK(searchbar_changed_cb),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((search_string_entry)))),
"focus_in_event",
G_CALLBACK(searchbar_focus_evt_in),
quicksearch);
- g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((search_string_entry)))),
"focus_out_event",
G_CALLBACK(searchbar_focus_evt_out),
quicksearch);
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, _("_Clear"));
+
update_extended_buttons(quicksearch);
return 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, _("_Clear"));
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;
}
}
gtk_widget_show(quicksearch->hbox_search);
update_extended_buttons(quicksearch);
gtk_widget_grab_focus(
- GTK_WIDGET(GTK_BIN(quicksearch->search_string_entry)->child));
+ GTK_WIDGET(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))));
GTK_EVENTS_FLUSH();
ctree = summary_get_main_widget(mainwin->summaryview);
if (ctree && mainwin->summaryview->selected)
- gtk_ctree_node_moveto(GTK_CTREE(ctree),
+ gtk_cmctree_node_moveto(GTK_CMCTREE(ctree),
mainwin->summaryview->selected,
0, 0.5, 0);
}
if (!matchstring || !(*matchstring))
quicksearch->in_typing = FALSE;
- g_signal_handlers_block_by_func(G_OBJECT(GTK_BIN(quicksearch->search_string_entry)->child),
+ g_signal_handlers_block_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
G_CALLBACK(searchbar_changed_cb), quicksearch);
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child),
+ 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(quicksearch->search_string_entry)->child),
+ g_signal_handlers_unblock_by_func(G_OBJECT(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry)))),
G_CALLBACK(searchbar_changed_cb), quicksearch);
prefs_common.summary_quicksearch_type = type;
gtk_widget_set_sensitive(quicksearch->clear_search, TRUE);
if (colors_initialised) {
gtk_widget_modify_base(
- GTK_BIN(quicksearch->search_string_entry)->child,
+ gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, error ? &red : &yellow);
gtk_widget_modify_text(
- GTK_BIN(quicksearch->search_string_entry)->child,
+ gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, &black);
}
} else {
gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
if (colors_initialised) {
gtk_widget_modify_base(
- GTK_BIN(quicksearch->search_string_entry)->child,
+ gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, NULL);
gtk_widget_modify_text(
- GTK_BIN(quicksearch->search_string_entry)->child,
+ gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))),
GTK_STATE_NORMAL, NULL);
}
}
{
gchar *searched_header = NULL;
gboolean result = FALSE;
+ gchar *to = NULL, *from = NULL, *subject = NULL;
if (!quicksearch->active)
return TRUE;
switch (prefs_common.summary_quicksearch_type) {
case QUICK_SEARCH_SUBJECT:
- searched_header = msginfo->subject;
+ if (msginfo->subject)
+ searched_header = g_utf8_casefold(msginfo->subject, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_FROM:
- searched_header = msginfo->from;
+ if (msginfo->from)
+ searched_header = g_utf8_casefold(msginfo->from, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_TO:
- searched_header = msginfo->to;
+ if (msginfo->to)
+ searched_header = g_utf8_casefold(msginfo->to, -1);
+ else
+ return FALSE;
break;
case QUICK_SEARCH_MIXED:
+ if (msginfo->to)
+ to = g_utf8_casefold(msginfo->to, -1);
+ if (msginfo->from)
+ from = g_utf8_casefold(msginfo->from, -1);
+ if (msginfo->subject)
+ subject = g_utf8_casefold(msginfo->subject, -1);
break;
case QUICK_SEARCH_EXTENDED:
break;
debug_print("unknown search type (%d)\n", prefs_common.summary_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 &&
quicksearch->search_string &&
- searched_header && strcasestr(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 &&
quicksearch->search_string && (
- (msginfo->to && strcasestr(msginfo->to, quicksearch->search_string) != NULL) ||
- (msginfo->from && strcasestr(msginfo->from, quicksearch->search_string) != NULL) ||
- (msginfo->subject && strcasestr(msginfo->subject, quicksearch->search_string) != NULL) ||
+ (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)) ))
result = TRUE;
prepare_matcher(quicksearch);
}
+ g_free(to);
+ g_free(from);
+ g_free(subject);
+ g_free(searched_header);
+
return result;
}
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;
}
newstr = g_realloc(newstr,o_len+n_len+1);
strcpy(newstr+o_len, "|tag regexpcase \"");
strcpy(newstr+o_len+(s_len-1), words[i]);
- strcpy(newstr+o_len+s_len, "\"");
+ strcpy(newstr+o_len+(n_len-1), "\"");
}
i++;
}
void quicksearch_pass_key(QuickSearch *quicksearch, guint val, GdkModifierType mod)
{
- GtkEntry *entry = GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child);
+ GtkEntry *entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN((quicksearch->search_string_entry))));
glong curpos = gtk_editable_get_position(GTK_EDITABLE(entry));
guint32 c;
char *str = g_strdup(gtk_entry_get_text(entry));
return result;
}
+gboolean quicksearch_is_in_subfolder(QuickSearch *quicksearch, FolderItem *cur)
+{
+ if (quicksearch->root_folder_item == NULL)
+ return FALSE;
+
+ while (cur) {
+ if (cur == quicksearch->root_folder_item) {
+ return TRUE;
+ }
+ cur = folder_item_parent(cur);
+ }
+ return FALSE;
+}
+
void quicksearch_search_subfolders(QuickSearch *quicksearch,
FolderView *folderview,
FolderItem *folder_item)
{
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);
+}
projects / claws.git / blobdiff